summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-19 10:56:49 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-04 13:49:32 (GMT)
commitf3077c2987cc44699edf9ed87d67c8652959e955 (patch)
tree7987f773ce65eaf0b545eeb3a89c6dbe0307eb9b
parent74f16492c2aeb6ea2030dfff254cac4e9510b7fb (diff)
downloaddefinitions-f3077c2987cc44699edf9ed87d67c8652959e955.tar.gz
OpenStack: Install default configuration for nova
Change-Id: I8d80f0d554c5ab7b0f71a41aee767521928b8444
-rw-r--r--install-files/openstack/manifest4
-rw-r--r--strata/openstack-services/nova.morph10
2 files changed, 8 insertions, 6 deletions
diff --git a/install-files/openstack/manifest b/install-files/openstack/manifest
index 1ecaa5e..be2fedb 100644
--- a/install-files/openstack/manifest
+++ b/install-files/openstack/manifest
@@ -53,12 +53,8 @@ template 0100644 0 0 /etc/tempest/tempest.conf
0040755 0 0 /usr/share/openstack/nova
0100644 0 0 /usr/share/openstack/nova-config.yml
0100644 0 0 /usr/share/openstack/nova-db.yml
-0100644 0 0 /usr/share/openstack/nova/logging.conf
0100644 0 0 /usr/share/openstack/nova/nova.conf
0100644 0 0 /usr/share/openstack/nova/nova-compute.conf
-0100644 0 0 /usr/share/openstack/nova/policy.json
-0100644 0 0 /usr/share/openstack/nova/cells.json
-0100644 0 0 /usr/share/openstack/nova/api-paste.ini
0100644 0 0 /usr/share/openstack/openvswitch.yml
0040755 0 0 /usr/share/openstack/postgres
0100644 0 0 /usr/share/openstack/postgres.yml
diff --git a/strata/openstack-services/nova.morph b/strata/openstack-services/nova.morph
index bb6dd75..e5a87da 100644
--- a/strata/openstack-services/nova.morph
+++ b/strata/openstack-services/nova.morph
@@ -2,11 +2,17 @@ name: nova
kind: chunk
build-system: python-distutils
post-install-commands:
+# Install some default configuration files
+- mkdir -p "$DESTDIR"/etc/nova
+- install -m 644 etc/nova/api-paste.ini "$DESTDIR"/etc/nova/
+- install -m 644 etc/nova/cells.json "$DESTDIR"/etc/nova/
+- install -m 644 etc/nova/logging_sample.conf "$DESTDIR"/etc/nova/logging.conf
+- install -m 644 etc/nova/policy.json "$DESTDIR"/etc/nova/
# Install rootwrap.conf
-- install -D -m 640 etc/nova/rootwrap.conf "$DESTDIR"/etc/nova/rootwrap.conf
+- install -m 640 etc/nova/rootwrap.conf "$DESTDIR"/etc/nova/rootwrap.conf
# Move rootwrap files to a proper location
- mkdir -p "$DESTDIR"/etc/nova/rootwrap.d
-- install -D -m 644 etc/nova/rootwrap.d/* "$DESTDIR"/etc/nova/rootwrap.d/
+- install -m 644 etc/nova/rootwrap.d/* "$DESTDIR"/etc/nova/rootwrap.d/
# Add nova to sudoers controlling which commands will run as a root
# using the openstack rootwrap.
- mkdir -p "$DESTDIR"/etc/sudoers.d