x
/
microstack
Code Issues Proposed changes

Switch region name to microstack

This commit is contained in:
James Page 2018-11-08 09:41:49 +00:00
parent 320a522d73
commit 6e422029a2
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
snap-overlay/bin/configure-openstack
View File

@ -14,7 +14,7 @@ openstack user show admin || {
--bootstrap-admin-url http://localhost:5000/v3/ \ --bootstrap-admin-url http://localhost:5000/v3/ \
--bootstrap-internal-url http://localhost:5000/v3/ \ --bootstrap-internal-url http://localhost:5000/v3/ \
--bootstrap-public-url http://localhost:5000/v3/ \ --bootstrap-public-url http://localhost:5000/v3/ \
--bootstrap-region-id RegionOne --bootstrap-region-id microstack
} }
openstack project show service || { openstack project show service || {
@ -39,7 +39,7 @@ openstack service show compute || {
--description "OpenStack Compute" compute --description "OpenStack Compute" compute
for endpoint in public internal admin; do for endpoint in public internal admin; do
openstack endpoint create --region RegionOne \ openstack endpoint create --region microstack \
compute $endpoint http://localhost:8774/v2.1 || : compute $endpoint http://localhost:8774/v2.1 || :
done done
} }
@ -49,7 +49,7 @@ openstack service show placement || {
--description "Placement API" placement --description "Placement API" placement
for endpoint in public internal admin; do for endpoint in public internal admin; do
openstack endpoint create --region RegionOne \ openstack endpoint create --region microstack \
placement $endpoint http://localhost:8778 || : placement $endpoint http://localhost:8778 || :
done done
} }
@ -98,7 +98,7 @@ openstack service show network || {
--description "OpenStack Network" network --description "OpenStack Network" network
for endpoint in public internal admin; do for endpoint in public internal admin; do
openstack endpoint create --region RegionOne \ openstack endpoint create --region microstack \
network $endpoint http://localhost:9696 || : network $endpoint http://localhost:9696 || :
done done
} }
@ -147,7 +147,7 @@ openstack user show glance || {
openstack service show image || { openstack service show image || {
openstack service create --name glance --description "OpenStack Image" image openstack service create --name glance --description "OpenStack Image" image
for endpoint in internal admin public; do for endpoint in internal admin public; do
openstack endpoint create --region RegionOne \ openstack endpoint create --region microstack \
image $endpoint http://localhost:9292 || : image $endpoint http://localhost:9292 || :
done done
} }

2
snap-overlay/etc/neutron/neutron.conf.d/nova.conf
View File

@ -7,7 +7,7 @@ auth_url = http://localhost:5000
auth_type = password auth_type = password
project_domain_name = default project_domain_name = default
user_domain_name = default user_domain_name = default
region_name = RegionOne region_name = microstack
project_name = service project_name = service
username = nova username = nova
password = nova password = nova

2
snap-overlay/etc/nova/nova.conf.d/neutron.conf
View File

@ -5,7 +5,7 @@ memcached_servers = localhost:11211
auth_type = password auth_type = password
project_domain_name = default project_domain_name = default
user_domain_name = default user_domain_name = default
region_name = RegionOne region_name = microstack
project_name = service project_name = service
username = neutron username = neutron
password = neutron password = neutron

2
snap-overlay/etc/nova/nova.conf.d/nova-placement.conf
View File

@ -1,5 +1,5 @@
[placement] [placement]
os_region_name = RegionOne os_region_name = microstack
project_domain_name = default project_domain_name = default
project_name = service project_name = service
auth_type = password auth_type = password

2
snap-overlay/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py
View File

@ -193,7 +193,7 @@ OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"
# should be specified. # should be specified.
# A key of '*' is an optional global default if no other key matches. # A key of '*' is an optional global default if no other key matches.
#DEFAULT_SERVICE_REGIONS = { #DEFAULT_SERVICE_REGIONS = {
# '*': 'RegionOne' # '*': 'microstack'
# OPENSTACK_KEYSTONE_URL: 'RegionTwo' # OPENSTACK_KEYSTONE_URL: 'RegionTwo'
#} #}

2
tests/configure-the-things.sh
View File

@ -29,7 +29,7 @@ microstack.openstack user show admin || {
--bootstrap-admin-url http://localhost:5000/v3/ \ --bootstrap-admin-url http://localhost:5000/v3/ \
--bootstrap-internal-url http://localhost:5000/v3/ \ --bootstrap-internal-url http://localhost:5000/v3/ \
--bootstrap-public-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 || { microstack.openstack project show service || {