Merge "Enable artifact signing for fuel merge jobs"

[releng.git] / jjb / joid / joid-deploy.sh

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 37b0c0d..4b8e3ff 100644 (file)
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -135,6 +135,11 @@ echo "------ Set ceph disks ------"
 sed -i -- "s@osd-devices: /srv@osd-devices: $CEPH_DISKS@" $SRCBUNDLE
 sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE
 
+# temporary sfc feature is availble only on onos and trusty
+if [ "$NFV_FEATURES" == 'sfc' ] && [ "$SDN_CONTROLLER" == 'onos' ];then
+    UBUNTU_DISTRO=trusty
+fi
+
 ##
 ## Configure Joid deployment
 ##
@@ -154,7 +159,7 @@ echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------"
 # get Keystone ip
 case "$HA_MODE" in
     "ha")
-        KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip)
+        KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase1.services.keystone.options.vip)
         ;;
     *)
         KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //')
@@ -182,7 +187,7 @@ export OS_USERNAME=admin
 export OS_PASSWORD=$OS_ADMIN_PASSWORD
 export OS_TENANT_NAME=admin
 export OS_AUTH_URL=http://$KEYSTONE:35357/v2.0
-export OS_REGION_NAME=Canonical
+export OS_REGION_NAME=RegionOne
 export OS_ENDPOINT_TYPE='adminURL'
 export CINDER_ENDPOINT_TYPE='adminURL'
 export GLANCE_ENDPOINT_TYPE='adminURL'