Browse Source

Switch region name to microstack

configure-hook
James Page 3 years ago
parent
commit
6e422029a2
  1. 10
      snap-overlay/bin/configure-openstack
  2. 2
      snap-overlay/etc/neutron/neutron.conf.d/nova.conf
  3. 2
      snap-overlay/etc/nova/nova.conf.d/neutron.conf
  4. 2
      snap-overlay/etc/nova/nova.conf.d/nova-placement.conf
  5. 2
      snap-overlay/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py
  6. 2
      tests/configure-the-things.sh

10
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
}

2
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

2
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

2
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

2
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'
#}

2
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 || {

Loading…
Cancel
Save