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
... | ... |
@@ -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 |
} |