From fe3b905188a77a67a4ef36c53dcd77926ece4156 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 20 Jul 2016 12:08:24 -0500 Subject: [PATCH] change the region from Canonical to default regionOne Enabling the onos with sfc for trusty only. Change-Id: I052eb82b2d4ccccad958c5564ede53a923e00aa5 Signed-off-by: Narinder Gupta --- jjb/joid/joid-deploy.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index 6d9e8aeba..4b8e3ffda 100644 --- 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 ## @@ -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' -- 2.16.6