summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-21 09:18:44 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-05-22 23:22:09 +0000
commit9aa1103d619fdf929739a19ea6f685a31bc05a12 (patch)
treeb8836381dd4076b21aff0172d37ca9e4a6f0f15f /strata
parent341ec4dda3aaa22b56fa08b2103c35b5d50f8a6d (diff)
downloaddefinitions-9aa1103d619fdf929739a19ea6f685a31bc05a12.tar.gz
WIP Ironic: update configuration files to Kilo
This commit updates the Ironic's configuration files to be the factory versions for the Kilo release. Our custom configuration will be re-added in a following commit.
Diffstat (limited to 'strata')
-rw-r--r--strata/openstack-services/ironic.morph15
1 files changed, 8 insertions, 7 deletions
diff --git a/strata/openstack-services/ironic.morph b/strata/openstack-services/ironic.morph
index 850399b4..8003dd17 100644
--- a/strata/openstack-services/ironic.morph
+++ b/strata/openstack-services/ironic.morph
@@ -2,14 +2,15 @@ name: ironic
kind: chunk
build-system: python-distutils
post-install-commands:
-# Install rootwrap.conf
-- install -D -m 640 etc/ironic/rootwrap.conf "$DESTDIR"/etc/ironic/rootwrap.conf
-# Move rootwrap files to a proper location
-- mkdir -p "$DESTDIR"/etc/ironic/rootwrap.d
-- install -m 644 etc/ironic/rootwrap.d/* "$DESTDIR"/etc/ironic/rootwrap.d/
-# Add ironic to sudoers controlling which commands will run as a root
-# using the openstack rootwrap.
- |
+ mkdir -p "$DESTDIR"/etc/ironic
+ install -m 644 etc/ironic/policy.json "$DESTDIR"/etc/ironic
+ install -m 644 etc/ironic/rootwrap.conf "$DESTDIR"/etc/ironic
+ mkdir -p "$DESTDIR"/etc/ironic/rootwrap.d
+ install -m 644 etc/ironic/rootwrap.d/* "$DESTDIR"/etc/ironic/rootwrap.d/
+
+ # Add ironic to sudoers controlling which commands will run as a root
+ # using the openstack rootwrap.
install -D -m 0440 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/sudoers.d/ironic-rootwrap
Defaults:ironic !requiretty