openstack/deb-murano
Code Issues Proposed changes

move configure_network post-config to extra phase

Browse Source 
configure_network uses neutron api. but in post-config phase neutron-api
service is not usable.

Change-Id: Ic204fae62660f300ac819fd6010228eb6864d336
This commit is contained in:
Choe, Cheng-Dae
2015-03-09 18:35:55 +09:00
parent d6f1971756
commit b0b0e25514
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/devstack/lib/murano
View File

@@ -145,9 +145,11 @@ function configure_murano_networking {
fi
# Configure networking options for Murano
if [[ -n "$MURANO_EXTERNAL_NETWORK" ]] && [[ -n "$ext_net_id" ]]; then
if [[ -n "$ext_net" ]] && [[ -n "$ext_net_id" ]]; then
iniset $MURANO_CONF_FILE networking external_network $ext_net_id
iniset $MURANO_CONF_FILE networking create_router 'true'
else
iniset $MURANO_CONF_FILE networking create_router 'false'
fi
if [[ -n "$MURANO_DEFAULT_ROUTER" ]]; then
@@ -203,13 +205,13 @@ function configure_murano {
# Configure Murano API URL
iniset $MURANO_CONF_FILE murano url "http://127.0.0.1:8082"
configure_murano_networking
}
# init_murano() - Initialize databases, etc.
function init_murano() {
configure_murano_networking
# (re)create Murano database
recreate_database murano utf8