Copy neutron service conf files into NEUTRON_CONF_DIR

dougwig · dougwig · commit 37da4592c200 · 2015-02-03T10:59:37.000-06:00
As part of splitting neutron into pieces, one of the steps was splitting the various bits of configuration into their respective repos. That just happened, and this change propagates those config files into /etc/neutron in the same manner that devstack is using for neutron.conf (and which is done via setup.cfg, like neutron, for regular package installs.) Required for neutron review: https://review.openstack.org/#/c/151541/ Change-Id: Ic9aec4401925eca9e1678d84662b96d346a911e3
diff --git a/lib/neutron b/lib/neutron
@@ -957,6 +957,9 @@ function _configure_neutron_ceilometer_notifications {
 }
 
 function _configure_neutron_lbaas {
+    if [ -f $NEUTRON_LBAAS_DIR/etc/neutron_lbaas.conf ]; then
+        cp $NEUTRON_LBAAS_DIR/etc/neutron_lbaas.conf $NEUTRON_CONF_DIR
+    fi
     neutron_agent_lbaas_configure_common
     neutron_agent_lbaas_configure_agent
 }
@@ -967,11 +970,17 @@ function _configure_neutron_metering {
 }
 
 function _configure_neutron_fwaas {
+    if [ -f $NEUTRON_FWAAS_DIR/etc/neutron_fwaas.conf ]; then
+        cp $NEUTRON_FWAAS_DIR/etc/neutron_fwaas.conf $NEUTRON_CONF_DIR
+    fi
     neutron_fwaas_configure_common
     neutron_fwaas_configure_driver
 }
 
 function _configure_neutron_vpn {
+    if [ -f $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf ]; then
+        cp $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf $NEUTRON_CONF_DIR
+    fi
     neutron_vpn_install_agent_packages
     neutron_vpn_configure_common
 }

Original file line number	Diff line number	Diff line change
`@@ -957,6 +957,9 @@ function _configure_neutron_ceilometer_notifications {`
`957`	`957`	`}`
`958`	`958`
`959`	`959`	`function _configure_neutron_lbaas {`
	`960`	`+ if [ -f $NEUTRON_LBAAS_DIR/etc/neutron_lbaas.conf ]; then`
	`961`	`+ cp $NEUTRON_LBAAS_DIR/etc/neutron_lbaas.conf $NEUTRON_CONF_DIR`
	`962`	`+ fi`
`960`	`963`	`neutron_agent_lbaas_configure_common`
`961`	`964`	`neutron_agent_lbaas_configure_agent`
`962`	`965`	`}`
`@@ -967,11 +970,17 @@ function _configure_neutron_metering {`
`967`	`970`	`}`
`968`	`971`
`969`	`972`	`function _configure_neutron_fwaas {`
	`973`	`+ if [ -f $NEUTRON_FWAAS_DIR/etc/neutron_fwaas.conf ]; then`
	`974`	`+ cp $NEUTRON_FWAAS_DIR/etc/neutron_fwaas.conf $NEUTRON_CONF_DIR`
	`975`	`+ fi`
`970`	`976`	`neutron_fwaas_configure_common`
`971`	`977`	`neutron_fwaas_configure_driver`
`972`	`978`	`}`
`973`	`979`
`974`	`980`	`function _configure_neutron_vpn {`
	`981`	`+ if [ -f $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf ]; then`
	`982`	`+ cp $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf $NEUTRON_CONF_DIR`
	`983`	`+ fi`
`975`	`984`	`neutron_vpn_install_agent_packages`
`976`	`985`	`neutron_vpn_configure_common`
`977`	`986`	`}`