Use identity-internal instead of public endpoint
The discussion on using identity-internval vs the public identity-api endpoint can be found here: https://groups.google.com/forum/#!topic/opscode-chef-openstack/an9rydsrC0k Change-Id: I1a629b87251954bcebf4482e8a466759422f9f71 Partial-Bug: 1412919
This commit is contained in:
parent
553ee424c8
commit
36dab0f601
|
@ -10,6 +10,7 @@ This file is used to list changes made in each version of the cookbook-openstack
|
||||||
* Run trove-manage as user, not as root
|
* Run trove-manage as user, not as root
|
||||||
* Skip trove-manage run on SUSE, it is run by the init scripts already
|
* Skip trove-manage run on SUSE, it is run by the init scripts already
|
||||||
* Use common specific_endpoint routines (bug 1412919)
|
* Use common specific_endpoint routines (bug 1412919)
|
||||||
|
* Use identity-internal endpoint (bug 1412919)
|
||||||
|
|
||||||
## 9.0.1
|
## 9.0.1
|
||||||
* Allow setting passwords via attributes by using the get_password method
|
* Allow setting passwords via attributes by using the get_password method
|
||||||
|
|
|
@ -45,7 +45,7 @@ db_uri = db_uri('database', db_user, db_pass).to_s
|
||||||
|
|
||||||
api_endpoint = internal_endpoint 'database-api'
|
api_endpoint = internal_endpoint 'database-api'
|
||||||
|
|
||||||
identity_uri = internal_endpoint('identity-api')
|
identity_uri = internal_endpoint('identity-internal')
|
||||||
compute_uri = internal_endpoint('compute-api').to_s.gsub(/%\(tenant_id\)s/, '')
|
compute_uri = internal_endpoint('compute-api').to_s.gsub(/%\(tenant_id\)s/, '')
|
||||||
block_storage_uri = internal_endpoint('block-storage-api').to_s.gsub(/%\(tenant_id\)s/, '')
|
block_storage_uri = internal_endpoint('block-storage-api').to_s.gsub(/%\(tenant_id\)s/, '')
|
||||||
object_storage_uri = internal_endpoint('object-storage-api')
|
object_storage_uri = internal_endpoint('object-storage-api')
|
||||||
|
|
|
@ -40,7 +40,7 @@ db_pass = get_password 'db', 'database'
|
||||||
db_uri = db_uri('database', db_user, db_pass).to_s
|
db_uri = db_uri('database', db_user, db_pass).to_s
|
||||||
rabbit = node['openstack']['mq']['database']['rabbit']
|
rabbit = node['openstack']['mq']['database']['rabbit']
|
||||||
rabbit_pass = get_password('user', rabbit['userid'])
|
rabbit_pass = get_password('user', rabbit['userid'])
|
||||||
identity_uri = internal_endpoint('identity-api')
|
identity_uri = internal_endpoint('identity-internal')
|
||||||
|
|
||||||
template '/etc/trove/trove-conductor.conf' do
|
template '/etc/trove/trove-conductor.conf' do
|
||||||
source 'trove-conductor.conf.erb'
|
source 'trove-conductor.conf.erb'
|
||||||
|
|
|
@ -39,7 +39,7 @@ db_user = node['openstack']['db']['database']['username']
|
||||||
db_pass = get_password 'db', 'database'
|
db_pass = get_password 'db', 'database'
|
||||||
db_uri = db_uri('database', db_user, db_pass).to_s
|
db_uri = db_uri('database', db_user, db_pass).to_s
|
||||||
|
|
||||||
identity_uri = internal_endpoint('identity-api')
|
identity_uri = internal_endpoint('identity-internal')
|
||||||
compute_uri = internal_endpoint('compute-api').to_s.gsub(/%\(tenant_id\)s/, '')
|
compute_uri = internal_endpoint('compute-api').to_s.gsub(/%\(tenant_id\)s/, '')
|
||||||
block_storage_uri = internal_endpoint('block-storage-api').to_s.gsub(/%\(tenant_id\)s/, '')
|
block_storage_uri = internal_endpoint('block-storage-api').to_s.gsub(/%\(tenant_id\)s/, '')
|
||||||
object_storage_uri = internal_endpoint('object-storage-api')
|
object_storage_uri = internal_endpoint('object-storage-api')
|
||||||
|
|
Loading…
Reference in New Issue