openstack/deb-murano
Code Issues Proposed changes

Customization of default_dns in Devstack

Browse Source 
This commit enables the customization of default_dns
in Devstack environment, using the environment
variable MURANO_DEFAULT_DNS.

Change-Id: Id494f683b469e7a47e0978197d7cb53f5824a6fc
This commit is contained in:
Olivier Lemasle 2015-10-07 14:12:00 +02:00
parent 70de27560b
commit b3d9859535
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/devstack/lib/murano
View File

@ -46,6 +46,7 @@ MURANO_KEYSTONE_SIGNING_DIR=${MURANO_KEYSTONE_SIGNING_DIR:-/tmp/keystone-signing
MURANO_DEFAULT_ROUTER=${MURANO_DEFAULT_ROUTER:-''}
MURANO_EXTERNAL_NETWORK=${MURANO_EXTERNAL_NETWORK:-''}
MURANO_DEFAULT_DNS=${MURANO_DEFAULT_DNS:-''}
# MURANO_RABBIT_VHOST allows to specify a separate virtual host for Murano services.
# This is not required if all OpenStack services are deployed by devstack scripts
@ -138,6 +139,10 @@ function configure_murano_networking {
if [[ -n "$MURANO_DEFAULT_ROUTER" ]]; then
iniset $MURANO_CONF_FILE networking router_name $MURANO_DEFAULT_ROUTER
fi
if [[ -n "$MURANO_DEFAULT_DNS" ]]; then
iniset $MURANO_CONF_FILE networking default_dns $MURANO_DEFAULT_DNS
fi
}
# Entry points

6
devstack/plugin.sh
View File

@ -42,6 +42,7 @@ MURANO_KEYSTONE_SIGNING_DIR=${MURANO_KEYSTONE_SIGNING_DIR:-/tmp/keystone-signing
MURANO_DEFAULT_ROUTER=${MURANO_DEFAULT_ROUTER:-''}
MURANO_EXTERNAL_NETWORK=${MURANO_EXTERNAL_NETWORK:-''}
MURANO_DEFAULT_DNS=${MURANO_DEFAULT_DNS:-''}
# MURANO_RABBIT_VHOST allows to specify a separate virtual host for Murano services.
# This is not required if all OpenStack services are deployed by devstack scripts
@ -134,6 +135,10 @@ function configure_murano_networking {
if [[ -n "$MURANO_DEFAULT_ROUTER" ]]; then
iniset $MURANO_CONF_FILE networking router_name $MURANO_DEFAULT_ROUTER
fi
if [[ -n "$MURANO_DEFAULT_DNS" ]]; then
iniset $MURANO_CONF_FILE networking default_dns $MURANO_DEFAULT_DNS
fi
}
# Entry points
@ -442,4 +447,3 @@ fi
# Restore xtrace
$XTRACE