summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-19 13:23:29 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-04 13:50:03 (GMT)
commit770ea35a295ea2c27d9ca50101b87575ef4df0a5 (patch)
tree6ce48fe5c20e6d110cec8fcf6c90b2040512b8d1
parentf3077c2987cc44699edf9ed87d67c8652959e955 (diff)
downloaddefinitions-770ea35a295ea2c27d9ca50101b87575ef4df0a5.tar.gz
OpenStack: Install default configuration for glance
Change-Id: If4f38bddc997f841ff50394dff3d9cf450d0f8a8
-rw-r--r--install-files/openstack/manifest7
-rw-r--r--strata/openstack-services.morph1
-rw-r--r--strata/openstack-services/glance.morph29
3 files changed, 30 insertions, 7 deletions
diff --git a/install-files/openstack/manifest b/install-files/openstack/manifest
index be2fedb..ed88169 100644
--- a/install-files/openstack/manifest
+++ b/install-files/openstack/manifest
@@ -21,15 +21,8 @@ template 0100644 0 0 /etc/tempest/tempest.conf
0100644 0 0 /usr/share/openstack/extras/60-device-dhcp.network
0100644 0 0 /usr/share/openstack/glance.yml
0040755 0 0 /usr/share/openstack/glance
-0100644 0 0 /usr/share/openstack/glance/logging.conf
0100644 0 0 /usr/share/openstack/glance/glance-api.conf
0100644 0 0 /usr/share/openstack/glance/glance-registry.conf
-0100644 0 0 /usr/share/openstack/glance/glance-scrubber.conf
-0100644 0 0 /usr/share/openstack/glance/glance-cache.conf
-0100644 0 0 /usr/share/openstack/glance/schema-image.json
-0100644 0 0 /usr/share/openstack/glance/policy.json
-0100644 0 0 /usr/share/openstack/glance/glance-api-paste.ini
-0100644 0 0 /usr/share/openstack/glance/glance-registry-paste.ini
0100644 0 0 /usr/share/openstack/horizon.yml
0040755 0 0 /usr/share/openstack/ironic
0100644 0 0 /usr/share/openstack/ironic.yml
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 98bc2bd..83fea18 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -399,6 +399,7 @@ chunks:
ref: 2174bdcae6e46f5f68f5b8ea984a695db9f41bcf
unpetrify-ref: v2.4.1
- name: glance
+ morph: strata/openstack-services/glance.morph
repo: upstream:openstack/glance
ref: 93b0d5fce3a41e4a3a549f98f78b6681cbc3ea95
unpetrify-ref: 2015.1.0
diff --git a/strata/openstack-services/glance.morph b/strata/openstack-services/glance.morph
new file mode 100644
index 0000000..3f81a50
--- /dev/null
+++ b/strata/openstack-services/glance.morph
@@ -0,0 +1,29 @@
+name: glance
+kind: chunk
+build-system: python-distutils
+post-install-commands:
+# Install some default configuration files
+- mkdir -p "$DESTDIR"/etc/glance
+- install -m 644 etc/glance-api-paste.ini "$DESTDIR"/etc/glance/
+- install -m 644 etc/glance-registry-paste.ini "$DESTDIR"/etc/glance/
+- install -m 644 etc/glance-search-paste.ini "$DESTDIR"/etc/glance/
+- install -m 644 etc/policy.json "$DESTDIR"/etc/glance/
+- install -m 644 etc/schema-image.json "$DESTDIR"/etc/glance/
+- install -m 644 etc/search-policy.json "$DESTDIR"/etc/glance/
+# Install predefined namespaces for Glance Metadata Definitions
+# Catalog (see more info in its README)
+- cp -r etc/metadefs "$DESTDIR"/etc/glance/
+# Install conf files which are not modified by
+- install -m 644 etc/glance-scrubber.conf "$DESTDIR"/etc/glance/
+- install -m 644 etc/glance-cache.conf "$DESTDIR"/etc/glance/
+- install -m 644 etc/glance-search.conf "$DESTDIR"/etc/glance/
+- |
+ install -m 644 etc/glance-swift.conf.sample \
+ "$DESTDIR"/etc/glance/glance-swift.conf
+- install -m 644 etc/glance-manage.conf "$DESTDIR"/etc/glance/
+- |
+ install -m 644 etc/property-protections-policies.conf.sample \
+ "$DESTDIR"/etc/glance/property-protections-policies.conf
+- |
+ install -m 644 etc/property-protections-roles.conf.sample \
+ "$DESTDIR"/etc/glance/property-protections-roles.conf