diff options
| author |   mei mei <meimei@huawei.com> | 2016-07-21 01:48:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-21 01:48:45 +0000 |
| commit | 4a13b366f41b56b0bbb28c7104b952213112adc4 (patch) | |
| tree | d70399fef189c33cd73edff9ccd962702afc0ed6 | |
| parent | 25c3f085055f6c6f7ecb686dc7a955e872c997b8 (diff) | |
| parent | fe3b905188a77a67a4ef36c53dcd77926ece4156 (diff) | |
Merge "change the region from Canonical to default regionOne"
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 7 |
1 files changed, 6 insertions, 1 deletions
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' |