Use devstack system public auth url as default VIM auth_url

some setting sets up keystone listening on non localhost, this
patch copies the vim_config.xml to devstack data dir, modifies
the auth_url according to devstack deployment's settings.

Depends-On: Iaa78bd4cebc515d64310d9e9aae93d0c22d9b5d1

Change-Id: Idf9b2e98f49655c7c3ab0c36321147983c91e5f8
Closes-Bug: #1611297
This commit is contained in:
gong yong sheng 2016-08-10 17:59:28 +08:00
parent 05fe0744c3
commit 9465e8281d

@ -384,9 +384,13 @@ function tacker_register_default_vim {
get_or_create_user $DEFAULT_VIM_USER $DEFAULT_VIM_PASSWORD
get_or_add_user_project_role "admin" $DEFAULT_VIM_USER $DEFAULT_VIM_PROJECT_NAME
get_or_add_user_project_role "advsvc" $DEFAULT_VIM_USER $DEFAULT_VIM_PROJECT_NAME
VIM_CONFIG_FILE="$TACKER_DIR/devstack/vim_config.yaml"
default_vim_id=$(tacker vim-register --is-default --config-file $VIM_CONFIG_FILE $DEFAULT_VIM_NAME -f value -c id)
echo $default_vim_id
echo "Register default VIM ..."
mkdir -p $DATA_DIR/tacker
cp $TACKER_DIR/devstack/vim_config.yaml $DATA_DIR/tacker
VIM_CONFIG_FILE="$DATA_DIR/tacker/vim_config.yaml"
sed -e "s|^auth_url:.*$|auth_url: \'${KEYSTONE_SERVICE_URI}\'|" -i $VIM_CONFIG_FILE
default_vim_id=$(tacker vim-register --is-default --description "Default VIM" --config-file $VIM_CONFIG_FILE $DEFAULT_VIM_NAME -c id | grep id | awk '{print $4}')
echo "Default VIM registration done as $default_vim_id at $KEYSTONE_SERVICE_URI."
}
function modify_heat_flavor_policy_rule {