summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-16 16:13:27 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2015-03-23 22:58:54 +0000
commit625f44ec72e0963858c1a4f9959a7fdfa25a1f3c (patch)
treeebbb55db0bea6cff8d37b2dbcd3e2ebb095e7f67 /strata
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.
Diffstat (limited to 'strata')
-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
4 files changed, 29 insertions, 0 deletions
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index dd95e5a2..89829944 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 00000000..bfc31026
--- /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 00000000..1de5678b
--- /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 00000000..4bf15bc7
--- /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/