From 6e422029a20869377ecdd7859b944331c6ce82ef Mon Sep 17 00:00:00 2001 From: James Page Date: Thu, 8 Nov 2018 09:41:49 +0000 Subject: [PATCH] Switch region name to microstack --- snap-overlay/bin/configure-openstack | 10 +++++----- snap-overlay/etc/neutron/neutron.conf.d/nova.conf | 2 +- snap-overlay/etc/nova/nova.conf.d/neutron.conf | 2 +- snap-overlay/etc/nova/nova.conf.d/nova-placement.conf | 2 +- .../openstack_dashboard/local/local_settings.py | 2 +- tests/configure-the-things.sh | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/snap-overlay/bin/configure-openstack b/snap-overlay/bin/configure-openstack index b00b49e..8e8d4e7 100755 --- a/snap-overlay/bin/configure-openstack +++ b/snap-overlay/bin/configure-openstack @@ -14,7 +14,7 @@ openstack user show admin || { --bootstrap-admin-url http://localhost:5000/v3/ \ --bootstrap-internal-url http://localhost:5000/v3/ \ --bootstrap-public-url http://localhost:5000/v3/ \ - --bootstrap-region-id RegionOne + --bootstrap-region-id microstack } openstack project show service || { @@ -39,7 +39,7 @@ openstack service show compute || { --description "OpenStack Compute" compute for endpoint in public internal admin; do - openstack endpoint create --region RegionOne \ + openstack endpoint create --region microstack \ compute $endpoint http://localhost:8774/v2.1 || : done } @@ -49,7 +49,7 @@ openstack service show placement || { --description "Placement API" placement for endpoint in public internal admin; do - openstack endpoint create --region RegionOne \ + openstack endpoint create --region microstack \ placement $endpoint http://localhost:8778 || : done } @@ -98,7 +98,7 @@ openstack service show network || { --description "OpenStack Network" network for endpoint in public internal admin; do - openstack endpoint create --region RegionOne \ + openstack endpoint create --region microstack \ network $endpoint http://localhost:9696 || : done } @@ -147,7 +147,7 @@ openstack user show glance || { openstack service show image || { openstack service create --name glance --description "OpenStack Image" image for endpoint in internal admin public; do - openstack endpoint create --region RegionOne \ + openstack endpoint create --region microstack \ image $endpoint http://localhost:9292 || : done } diff --git a/snap-overlay/etc/neutron/neutron.conf.d/nova.conf b/snap-overlay/etc/neutron/neutron.conf.d/nova.conf index 9eaada9..a26a142 100644 --- a/snap-overlay/etc/neutron/neutron.conf.d/nova.conf +++ b/snap-overlay/etc/neutron/neutron.conf.d/nova.conf @@ -7,7 +7,7 @@ auth_url = http://localhost:5000 auth_type = password project_domain_name = default user_domain_name = default -region_name = RegionOne +region_name = microstack project_name = service username = nova password = nova diff --git a/snap-overlay/etc/nova/nova.conf.d/neutron.conf b/snap-overlay/etc/nova/nova.conf.d/neutron.conf index 898708a..5915075 100644 --- a/snap-overlay/etc/nova/nova.conf.d/neutron.conf +++ b/snap-overlay/etc/nova/nova.conf.d/neutron.conf @@ -5,7 +5,7 @@ memcached_servers = localhost:11211 auth_type = password project_domain_name = default user_domain_name = default -region_name = RegionOne +region_name = microstack project_name = service username = neutron password = neutron diff --git a/snap-overlay/etc/nova/nova.conf.d/nova-placement.conf b/snap-overlay/etc/nova/nova.conf.d/nova-placement.conf index 4503a1d..a954be2 100644 --- a/snap-overlay/etc/nova/nova.conf.d/nova-placement.conf +++ b/snap-overlay/etc/nova/nova.conf.d/nova-placement.conf @@ -1,5 +1,5 @@ [placement] -os_region_name = RegionOne +os_region_name = microstack project_domain_name = default project_name = service auth_type = password diff --git a/snap-overlay/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py b/snap-overlay/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py index 7c61a1e..6142ba6 100644 --- a/snap-overlay/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py +++ b/snap-overlay/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py @@ -193,7 +193,7 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_" # should be specified. # A key of '*' is an optional global default if no other key matches. #DEFAULT_SERVICE_REGIONS = { -# '*': 'RegionOne' +# '*': 'microstack' # OPENSTACK_KEYSTONE_URL: 'RegionTwo' #} diff --git a/tests/configure-the-things.sh b/tests/configure-the-things.sh index af2dd31..d46a394 100644 --- a/tests/configure-the-things.sh +++ b/tests/configure-the-things.sh @@ -29,7 +29,7 @@ microstack.openstack user show admin || { --bootstrap-admin-url http://localhost:5000/v3/ \ --bootstrap-internal-url http://localhost:5000/v3/ \ --bootstrap-public-url http://localhost:5000/v3/ \ - --bootstrap-region-id RegionOne + --bootstrap-region-id microstack } microstack.openstack project show service || {