Browse code

Merge "Copy neutron service conf files into NEUTRON_CONF_DIR"

Jenkins authored on 2015/02/04 12:42:50
Showing 1 changed files
... ...
@@ -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 967
 }
968 968
 
969 969
 function _configure_neutron_fwaas {
970
+    if [ -f $NEUTRON_FWAAS_DIR/etc/neutron_fwaas.conf ]; then
971
+        cp $NEUTRON_FWAAS_DIR/etc/neutron_fwaas.conf $NEUTRON_CONF_DIR
972
+    fi
970 973
     neutron_fwaas_configure_common
971 974
     neutron_fwaas_configure_driver
972 975
 }
973 976
 
974 977
 function _configure_neutron_vpn {
978
+    if [ -f $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf ]; then
979
+        cp $NEUTRON_VPNAAS_DIR/etc/neutron_vpnaas.conf $NEUTRON_CONF_DIR
980
+    fi
975 981
     neutron_vpn_install_agent_packages
976 982
     neutron_vpn_configure_common
977 983
 }