diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/default_deployment_config.yaml | 2 | ||||
| -rwxr-xr-x | ci/openstack.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml index 8d7f184f..fe5b669b 100644 --- a/ci/default_deployment_config.yaml +++ b/ci/default_deployment_config.yaml @@ -6,7 +6,7 @@ os: mode: ha cluster_size: 3 lxd: False - region: Canonical + region: RegionOne admin: role: admin name: admin diff --git a/ci/openstack.sh b/ci/openstack.sh index 7f5c4c70..781e862d 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -63,7 +63,7 @@ create_openrc() { mkdir -m 0700 -p cloud keystoneIp=$(keystoneIp) adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null) - configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 Canonical > cloud/admin-openrc + configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > cloud/admin-openrc chmod 0600 cloud/admin-openrc } @@ -170,7 +170,7 @@ if [ "$API_FQDN" != "''" ]; then CONGRESS_PUB_ENDPOINT=$(openstack endpoint list --service policy --interface public -c ID -f value) openstack endpoint delete $CONGRESS_PUB_ENDPOINT CONGRESS_NEW_PUB_ENDPOINT=$(openstack endpoint list --service policy --interface internal -c URL -f value) - openstack endpoint create --region Canonical policy public $CONGRESS_NEW_PUB_ENDPOINT + openstack endpoint create --region RegionOne policy public $CONGRESS_NEW_PUB_ENDPOINT fi openstack congress datasource create nova "nova" \ |