From 4f6f5c5b2fa6cdcdc6ca038ddaa22688fe02244a Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Tue, 19 May 2015 14:13:07 +0000
Subject: Neutron: update configuration files to Kilo

This commit updates the Neutron's configuration files to be the factory
versions for the Kilo release.  Our custom configuration will be
re-added in a following commit.

Also install configuration files which will are not going to be modified
in the following commit, in the post-install-commands for the chunk; as
opposite to having them laying around in the repo and installing them
with the install-files configuration extension.
---
 strata/openstack-services/neutron.morph | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'strata')

diff --git a/strata/openstack-services/neutron.morph b/strata/openstack-services/neutron.morph
index b79a089b..6e203922 100644
--- a/strata/openstack-services/neutron.morph
+++ b/strata/openstack-services/neutron.morph
@@ -2,14 +2,24 @@ 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/
-# Add neutron to sudoers controlling which commands is running as a root
-# using the openstack rootwrap.
-- mkdir -p "$DESTDIR"/etc/sudoers.d
 - |
+  # Move the configuration files to a proper location
+  mkdir "$DESTDIR"/etc
+  mv "$DESTDIR/$PREFIX"/etc/neutron "$DESTDIR"/etc
+
+  # Remove unused start/stop script
+  rm "$DESTDIR/$PREFIX"/etc/init.d/neutron-server
+
+  # Remove configuration files which will be added by Ansible
+  rm "$DESTDIR"/etc/neutron/neutron.conf
+  rm "$DESTDIR"/etc/neutron/metadata_agent.ini
+  rm "$DESTDIR"/etc/neutron/plugins/ml2/ml2_conf.ini
+  rm "$DESTDIR"/etc/neutron/dhcp_agent.ini
+  rm "$DESTDIR"/etc/neutron/l3_agent.ini
+
+  # Add neutron to sudoers controlling which commands is running as a
+  # root using the openstack rootwrap.
+  mkdir -p "$DESTDIR"/etc/sudoers.d
   install -D -m 0440 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/sudoers.d/neutron-rootwrap
   Defaults:neutron !requiretty
 
-- 
cgit v1.2.1