diff options
Diffstat (limited to 'jjb/joid')
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 849112319..946785d91 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -103,7 +103,7 @@ builders: - trigger-builds: - project: 'joid-deploy-{pod}-daily-{stream}' - current-parameters: false + current-parameters: true predefined-parameters: DEPLOY_SCENARIO={scenario} same-node: true diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index cdf92a785..9d15390b3 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -127,7 +127,7 @@ SRCBUNDLE="${SRCBUNDLE}/ovs-${SDN_CONTROLLER}-${HA_MODE}.yaml" # Modify Bundle echo "------ Set openstack password ------" -sed -i -- "s/\"admin-password\": openstack/\"admin-password\": $OS_ADMIN_PASSWORD/" $SRCBUNDLE +sed -i -- "s/admin-password: openstack/admin-password: $OS_ADMIN_PASSWORD/" $SRCBUNDLE if [ -n "$EXTNET_NAME" ]; then echo "------ Set openstack default network ------" @@ -162,8 +162,16 @@ exit_on_error $? "Main deploy FAILED" JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------" -# get Keystone vip -KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip) +# get Keystone ip +case "$HA_MODE" in + "ha") + KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip) + ;; + *) + KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //') + ;; +esac + # get controller IP case "$SDN_CONTROLLER" in |