Merge "Copy neutron service conf files into NEUTRON_CONF_DIR"

Jenkins · openstack-gerrit · commit 6262152064eb · 2015-02-04T03:42:50.000Z
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`	`}`