Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Containerized Swift Services."
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
keystone.yaml
diff --git
a/puppet/services/keystone.yaml
b/puppet/services/keystone.yaml
index
b989d50
..
9c4cc60
100644
(file)
--- a/
puppet/services/keystone.yaml
+++ b/
puppet/services/keystone.yaml
@@
-193,8
+193,7
@@
outputs:
- '@'
- {get_param: [EndpointMap, MysqlInternal, host]}
- '/keystone'
- '@'
- {get_param: [EndpointMap, MysqlInternal, host]}
- '/keystone'
- - '?bind_address='
- - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
+ - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
keystone::admin_token: {get_param: AdminToken}
keystone::admin_password: {get_param: AdminPassword}
keystone::roles::admin::password: {get_param: AdminPassword}
keystone::admin_token: {get_param: AdminToken}
keystone::admin_password: {get_param: AdminPassword}
keystone::roles::admin::password: {get_param: AdminPassword}
@@
-310,11
+309,5
@@
outputs:
- name: Stop keystone service (running under httpd)
tags: step2
service: name=httpd state=stopped
- name: Stop keystone service (running under httpd)
tags: step2
service: name=httpd state=stopped
- - name: Sync keystone DB
- tags: step5
- command: keystone-manage db_sync
- - name: Start keystone service (running under httpd)
- tags: step6
- service: name=httpd state=started
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]