python-neutron: openvswitch plugin read config files

Currently the openvswitch plugin doesn't read any config files so we
are unable to configure it properly. Have the init script pass in the
config files we are already installing.

The config needs local_ip set otherwise it will fail to run.

We can't just tack rabbit_host on the end of the conf file as it is
in the wrong section, so change this to a substitution.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-neutron/ovs_neutron_plugin.ini b/meta-openstack/recipes-devtools/python/python-neutron/ovs_neutron_plugin.ini
index 54f50b0..9d5c83b 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron/ovs_neutron_plugin.ini
+++ b/meta-openstack/recipes-devtools/python/python-neutron/ovs_neutron_plugin.ini
@@ -87,6 +87,7 @@ tunnel_id_ranges = 1:1000
 # this hypervisor.
 #
 # Default: local_ip =
+local_ip = %CONTROLLER_IP%
 
 # (ListOpt) Comma-separated list of <physical_network>:<bridge> tuples
 # mapping physical network names to the agent's node-specific OVS
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 1621923..9b291df 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -35,7 +35,7 @@ do_install_append() {
     sed -e "s:^# core_plugin.*:core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2:g" \
         -i ${WORKDIR}/neutron.conf
 
-    echo "rabbit_host = ${CONTROLLER_IP}" >> ${WORKDIR}/neutron.conf
+    sed -e "s:^# rabbit_host =.*:rabbit_host = ${CONTROLLER_IP}:" -i ${WORKDIR}/neutron.conf
 
     for file in ovs_neutron_plugin.ini linuxbridge_conf.ini
     do
@@ -56,7 +56,7 @@ do_install_append() {
     install -m 600 ${S}/etc/policy.json ${NEUTRON_CONF_DIR}/
 
     PLUGIN=openvswitch
-    ARGS=""
+    ARGS="--config-file=${sysconfdir}/${SRCNAME}/neutron.conf --config-file=${sysconfdir}/${SRCNAME}/plugins/openvswitch/ovs_neutron_plugin.ini"
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
         sed "s:@plugin@:/etc/neutron/plugins/$PLUGIN/ovs_neutron_plugin.ini:" \