summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-16 16:13:27 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2015-03-23 22:58:54 (GMT)
commit625f44ec72e0963858c1a4f9959a7fdfa25a1f3c (patch)
treeebbb55db0bea6cff8d37b2dbcd3e2ebb095e7f67
parent68dfc7748eb30ede98ae0c7cd397a00699ddad46 (diff)
downloaddefinitions-625f44ec72e0963858c1a4f9959a7fdfa25a1f3c.tar.gz
Install rootwrap filters on post-install time
Installing rootwrap filters from their repositories will make easy to deal with updates. Also move neutron rootwrap filters to the right location without duplication.
-rw-r--r--openstack/manifest24
-rw-r--r--strata/openstack-services.morph3
-rw-r--r--strata/openstack-services/cinder.morph9
-rw-r--r--strata/openstack-services/neutron.morph8
-rw-r--r--strata/openstack-services/nova.morph9
5 files changed, 29 insertions, 24 deletions
diff --git a/openstack/manifest b/openstack/manifest
index a1badde..b19142b 100644
--- a/openstack/manifest
+++ b/openstack/manifest
@@ -34,18 +34,11 @@
0040755 0 0 /var/lib/nova
0040755 0 0 /etc/nova
0100644 0 0 /etc/nova/logging.conf
-0100644 0 0 /etc/nova/rootwrap.conf
0100644 0 0 /etc/nova/nova.conf
0100644 0 0 /etc/nova/nova-compute.conf
0100644 0 0 /etc/nova/policy.json
0100644 0 0 /etc/nova/cells.json
0100644 0 0 /etc/nova/api-paste.ini
-0040755 0 0 /etc/nova/rootwrap.d/
-0100644 0 0 /etc/nova/rootwrap.d/api-metadata.filters
-0100644 0 0 /etc/nova/rootwrap.d/baremetal-compute-ipmi.filters
-0100644 0 0 /etc/nova/rootwrap.d/baremetal-deploy-helper.filters
-0100644 0 0 /etc/nova/rootwrap.d/compute.filters
-0100644 0 0 /etc/nova/rootwrap.d/network.filters
0100755 0 0 /usr/share/openstack/openstack-nova-setup
0100644 0 0 /etc/systemd/system/openstack-nova-setup.service
0100644 0 0 /etc/systemd/system/openstack-nova-compute.service
@@ -61,7 +54,6 @@
0040755 0 0 /var/lib/rabbitmq
0040755 0 0 /var/lib/cinder
0040755 0 0 /etc/cinder
-0100644 0 0 /etc/cinder/rootwrap.conf
0100644 0 0 /etc/cinder/cinder.conf
0100644 0 0 /etc/cinder/api-paste.ini
0100644 0 0 /etc/cinder/policy.json
@@ -71,11 +63,8 @@
0100644 0 0 /etc/systemd/system/openstack-cinder-scheduler.service
0100644 0 0 /etc/systemd/system/openstack-cinder-volume.service
0100644 0 0 /etc/systemd/system/openstack-cinder-backup.service
-0040755 0 0 /etc/cinder/rootwrap.d/
-0100644 0 0 /etc/cinder/rootwrap.d/volume.filters
0040755 0 0 /etc/neutron
0040755 0 0 /var/lib/neutron
-0100644 0 0 /etc/neutron/rootwrap.conf
0100644 0 0 /etc/neutron/neutron.conf
0100644 0 0 /etc/neutron/api-paste.ini
0100644 0 0 /etc/neutron/policy.json
@@ -86,19 +75,6 @@
0100644 0 0 /etc/neutron/fwaas_driver.ini
0100644 0 0 /etc/neutron/metering_agent.ini
0100644 0 0 /etc/neutron/vpn_agent.ini
-0040755 0 0 /etc/neutron/rootwrap.d/
-0100644 0 0 /etc/neutron/rootwrap.d/cisco-apic.filters
-0100644 0 0 /etc/neutron/rootwrap.d/debug.filters
-0100644 0 0 /etc/neutron/rootwrap.d/dhcp.filters
-0100644 0 0 /etc/neutron/rootwrap.d/ipset-firewall.filters
-0100644 0 0 /etc/neutron/rootwrap.d/iptables-firewall.filters
-0100644 0 0 /etc/neutron/rootwrap.d/l3.filters
-0100644 0 0 /etc/neutron/rootwrap.d/lbaas-haproxy.filters
-0100644 0 0 /etc/neutron/rootwrap.d/linuxbridge-plugin.filters
-0100644 0 0 /etc/neutron/rootwrap.d/nec-plugin.filters
-0100644 0 0 /etc/neutron/rootwrap.d/ofagent.filters
-0100644 0 0 /etc/neutron/rootwrap.d/openvswitch-plugin.filters
-0100644 0 0 /etc/neutron/rootwrap.d/vpnaas.filters
0040755 0 0 /etc/neutron/plugins/
0040755 0 0 /etc/neutron/plugins/bigswitch
0100644 0 0 /etc/neutron/plugins/bigswitch/restproxy.ini
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index dd95e5a..8982994 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -621,6 +621,7 @@ chunks:
- posix-ipc-tarball
- sqlparse
- name: neutron
+ morph: strata/openstack-services/neutron.morph
repo: upstream:openstack/neutron
ref: dfa4b4b9b6b19a627cfb5eb5c6ab9db4961a06ea
unpetrify-ref: 2014.2.1
@@ -680,6 +681,7 @@ chunks:
unpetrify-ref: rfc3986-0.2.0
build-depends: []
- name: nova
+ morph: strata/openstack-services/nova.morph
repo: upstream:openstack/nova
ref: ba25e9ea6d0d42dd3b78cc6440710fd9362ae1b5
unpetrify-ref: 2014.2.1
@@ -709,6 +711,7 @@ chunks:
- rfc3986
- oslo-vmware
- name: cinder
+ morph: strata/openstack-services/cinder.morph
repo: upstream:openstack/cinder
ref: b48aee211ad9b2571c8554dd162b37b8a8d80a42
unpetrify-ref: 2014.2.1
diff --git a/strata/openstack-services/cinder.morph b/strata/openstack-services/cinder.morph
new file mode 100644
index 0000000..bfc3102
--- /dev/null
+++ b/strata/openstack-services/cinder.morph
@@ -0,0 +1,9 @@
+name: cinder
+kind: chunk
+build-system: python-distutils
+post-install-commands:
+# Install rootwrap.conf
+- install -D -m 640 etc/cinder/rootwrap.conf "$DESTDIR"/etc/cinder/rootwrap.conf
+# Move rootwrap files to a proper location
+- mkdir -p "$DESTDIR"/etc/cinder/rootwrap.d
+- install -D -m 644 etc/cinder/rootwrap.d/* "$DESTDIR"/etc/cinder/rootwrap.d/
diff --git a/strata/openstack-services/neutron.morph b/strata/openstack-services/neutron.morph
new file mode 100644
index 0000000..1de5678
--- /dev/null
+++ b/strata/openstack-services/neutron.morph
@@ -0,0 +1,8 @@
+name: neutron
+kind: chunk
+build-system: python-distutils
+post-install-commands:
+# Move rootwrap files to a proper location
+- mkdir -p "$DESTDIR"/etc/neutron
+- mv "$DESTDIR$PREFIX"/etc/neutron/rootwrap.d "$DESTDIR"/etc/neutron/
+- mv "$DESTDIR$PREFIX"/etc/neutron/rootwrap.conf "$DESTDIR"/etc/neutron/
diff --git a/strata/openstack-services/nova.morph b/strata/openstack-services/nova.morph
new file mode 100644
index 0000000..4bf15bc
--- /dev/null
+++ b/strata/openstack-services/nova.morph
@@ -0,0 +1,9 @@
+name: nova
+kind: chunk
+build-system: python-distutils
+post-install-commands:
+# Install rootwrap.conf
+- install -D -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/