openstack/deb-murano
Code Issues Proposed changes

Merge "Fix some options set by devstack"

Browse Source
This commit is contained in:
Jenkins 2014-04-16 12:59:45 +00:00 committed by Gerrit Code Review
commit b8d612757c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/devstack/lib/murano
View File

@ -34,6 +34,8 @@ MURANO_SERVICE_HOST=${MURANO_SERVICE_HOST:-$SERVICE_HOST}
MURANO_SERVICE_PORT=${MURANO_SERVICE_PORT:-8082} MURANO_SERVICE_PORT=${MURANO_SERVICE_PORT:-8082}
MURANO_SERVICE_PROTOCOL=${MURANO_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} MURANO_SERVICE_PROTOCOL=${MURANO_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
MURANO_ADMIN_USER=${MURANO_ADMIN_USER:-murano}
# Support entry points installation of console scripts # Support entry points installation of console scripts
if [[ -d $MURANO_DIR/bin ]]; then if [[ -d $MURANO_DIR/bin ]]; then
MURANO_BIN_DIR=$MURANO_DIR/bin MURANO_BIN_DIR=$MURANO_DIR/bin
@ -56,7 +58,7 @@ function create_murano_accounts() {
ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }") ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }")
MURANO_USER=$(openstack user create \ MURANO_USER=$(openstack user create \
murano \ $MURANO_ADMIN_USER \
--password "$SERVICE_PASSWORD" \ --password "$SERVICE_PASSWORD" \
--project $SERVICE_TENANT \ --project $SERVICE_TENANT \
--email murano@example.com \ --email murano@example.com \
@ -114,7 +116,7 @@ function configure_murano {
iniset $MURANO_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL iniset $MURANO_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL
iniset $MURANO_CONF_FILE keystone_authtoken cafile $KEYSTONE_SSL_CA iniset $MURANO_CONF_FILE keystone_authtoken cafile $KEYSTONE_SSL_CA
iniset $MURANO_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME iniset $MURANO_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $MURANO_CONF_FILE keystone_authtoken admin_user murano iniset $MURANO_CONF_FILE keystone_authtoken admin_user $MURANO_ADMIN_USER
iniset $MURANO_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD iniset $MURANO_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD
# configure the rpc service. # configure the rpc service.
@ -125,6 +127,9 @@ function configure_murano {
# configure the database. # configure the database.
iniset $MURANO_CONF_FILE database connection `database_connection_url murano` iniset $MURANO_CONF_FILE database connection `database_connection_url murano`
# Configure keystone auth url
iniset $MURANO_CONF_FILE keystone auth_url "http://${KEYSTONE_AUTH_HOST}:5000/v2.0"
} }