Ansible Neutron support

Add initial Ansible support for Neutron

Change-Id: Idad011945bff914535d1ac0eb09cc9d3b0882fbe
Partially-Implements: blueprint ansible-service

8 files changed, 46 insertions, 12 deletions

diff --git a/docker/common/neutron/neutron-dhcp-agent/start.sh b/docker/common/neutron/neutron-dhcp-agent/start.sh
index a89aaf604..71ec4678a 100755
--- a/docker/common/neutron/neutron-dhcp-agent/start.sh
+++ b/docker/common/neutron/neutron-dhcp-agent/start.sh
@@ -2,7 +2,7 @@
 set -o errexit
 
 CMD="/usr/bin/neutron-dhcp-agent"
-ARGS="--config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron"
+ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini"
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
@@ -16,14 +16,14 @@ set_configs() {
             exec /opt/kolla/neutron-dhcp-agent/config-internal.sh
             ;;
         CONFIG_EXTERNAL_COPY_ALWAYS)
-            source /opt/kolla/neutron-dhcp-agent/config-exernal.sh
+            source /opt/kolla/neutron-dhcp-agent/config-external.sh
             ;;
         CONFIG_EXTERNAL_COPY_ONCE)
             if [[ -f /configured-dhcp ]]; then
                 echo 'INFO - Neutron-dhcp has already been configured; Refusing to copy new configs'
                 return
             fi
-            source /opt/kolla/neutron-dhcp-agent/config-exernal.sh
+            source /opt/kolla/neutron-dhcp-agent/config-external.sh
             touch /configured-dhcp
             ;;
 
diff --git a/docker/common/neutron/neutron-l3-agent/config-external.sh b/docker/common/neutron/neutron-l3-agent/config-external.sh
index 5b85898b7..e6eb049a4 100755
--- a/docker/common/neutron/neutron-l3-agent/config-external.sh
+++ b/docker/common/neutron/neutron-l3-agent/config-external.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCES="/opt/kolla/neutron-l3-agent/neutron.conf /opt/kolla/neutron-l3-agent/l3_agent.ini /opt/kolla/neutron-l3-agent/fwaas_driver.ini"
+SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/l3_agent.ini /opt/kolla/neutron-agents/fwaas_driver.ini"
 TARGET="/etc/neutron/"
 OWNER="neutron"
 
@@ -11,3 +11,13 @@ for f in $SOURCES; do
         chmod 0644 $TARGET/$fname
     fi
 done
+
+SOURCE="/opt/kolla/neutron-agents/ml2_conf.ini"
+TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
+OWNER="neutron"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/common/neutron/neutron-l3-agent/start.sh b/docker/common/neutron/neutron-l3-agent/start.sh
index ca301d196..fd85c22b1 100755
--- a/docker/common/neutron/neutron-l3-agent/start.sh
+++ b/docker/common/neutron/neutron-l3-agent/start.sh
@@ -2,7 +2,7 @@
 set -o errexit
 
 CMD="/usr/bin/neutron-l3-agent"
-ARGS="--config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-dir /etc/neutron"
+ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
@@ -16,14 +16,14 @@ set_configs() {
             exec /opt/kolla/neutron-l3-agent/config-internal.sh
             ;;
         CONFIG_EXTERNAL_COPY_ALWAYS)
-            source /opt/kolla/neutron-l3-agent/config-exernal.sh
+            source /opt/kolla/neutron-l3-agent/config-external.sh
             ;;
         CONFIG_EXTERNAL_COPY_ONCE)
             if [[ -f /configured-l3 ]]; then
                 echo 'INFO - Neutron-l3 has already been configured; Refusing to copy new configs'
                 return
             fi
-            source /opt/kolla/neutron-l3-agent/config-exernal.sh
+            source /opt/kolla/neutron-l3-agent/config-external.sh
             touch /configured-l3
             ;;
 
diff --git a/docker/common/neutron/neutron-metadata-agent/start.sh b/docker/common/neutron/neutron-metadata-agent/start.sh
index c43388b0c..e67946117 100755
--- a/docker/common/neutron/neutron-metadata-agent/start.sh
+++ b/docker/common/neutron/neutron-metadata-agent/start.sh
@@ -2,7 +2,7 @@
 set -o errexit
 
 CMD="/usr/bin/neutron-metadata-agent"
-ARGS="--config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron"
+ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini"
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
@@ -16,14 +16,14 @@ set_configs() {
             exec /opt/kolla/neutron-metadata-agent/config-internal.sh
             ;;
         CONFIG_EXTERNAL_COPY_ALWAYS)
-            source /opt/kolla/neutron-metadata-agent/config-exernal.sh
+            source /opt/kolla/neutron-metadata-agent/config-external.sh
             ;;
         CONFIG_EXTERNAL_COPY_ONCE)
             if [[ -f /configured-md ]]; then
                 echo 'INFO - Neutron-metadata has already been configured; Refusing to copy new configs'
                 return
             fi
-            source /opt/kolla/neutron-metadata-agent/config-exernal.sh
+            source /opt/kolla/neutron-metadata-agent/config-external.sh
             touch /configured-md
             ;;
 
diff --git a/docker/common/neutron/neutron-openvswitch-agent/config-external.sh b/docker/common/neutron/neutron-openvswitch-agent/config-external.sh
index 780c2be14..552d69861 100755
--- a/docker/common/neutron/neutron-openvswitch-agent/config-external.sh
+++ b/docker/common/neutron/neutron-openvswitch-agent/config-external.sh
@@ -8,3 +8,13 @@ if [[ -f "$SOURCE" ]]; then
     chown ${OWNER}: $TARGET
     chmod 0644 $TARGET
 fi
+
+SOURCE="/opt/kolla/neutron-openvswitch-agent/ml2_conf.ini"
+TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
+OWNER="neutron"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/common/neutron/neutron-openvswitch-agent/start.sh b/docker/common/neutron/neutron-openvswitch-agent/start.sh
index 6c2add489..4c05db9c5 100755
--- a/docker/common/neutron/neutron-openvswitch-agent/start.sh
+++ b/docker/common/neutron/neutron-openvswitch-agent/start.sh
@@ -2,7 +2,7 @@
 set -o errexit
 
 CMD="/usr/bin/neutron-openvswitch-agent"
-ARGS="--config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
+ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
@@ -10,4 +10,7 @@ source /opt/kolla/kolla-common.sh
 # Config-internal script exec out of this function, it does not return here.
 set_configs
 
+# Set !requiretty
+source /opt/kolla/config-sudoers.sh
+
 exec $CMD $ARGS
diff --git a/docker/common/neutron/neutron-server/config-external.sh b/docker/common/neutron/neutron-server/config-external.sh
index 83cd33ba5..c8558ecca 100755
--- a/docker/common/neutron/neutron-server/config-external.sh
+++ b/docker/common/neutron/neutron-server/config-external.sh
@@ -8,3 +8,14 @@ if [[ -f "$SOURCE" ]]; then
     chown ${OWNER}: $TARGET
     chmod 0644 $TARGET
 fi
+
+# TODO(SamYaple): Remove this from neutron-server once bootstrap is understood
+SOURCE="/opt/kolla/neutron-openvswitch-agent/ml2_conf.ini"
+TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
+OWNER="neutron"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/common/neutron/neutron-server/start.sh b/docker/common/neutron/neutron-server/start.sh
index 295caaac6..7df950e57 100755
--- a/docker/common/neutron/neutron-server/start.sh
+++ b/docker/common/neutron/neutron-server/start.sh
@@ -2,7 +2,7 @@
 set -o errexit
 
 CMD="/usr/bin/neutron-server"
-ARGS="--config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
+ARGS="--config-file /etc/neutron/neutron.conf"
 
 # Loading common functions.
 source /opt/kolla/kolla-common.sh