x
/
fuel-ccp-keystone
Code Issues Proposed changes

Use database service name from config 

Change-Id: Icf97a02ed235e93cde45fdc94a50049cb38f69a9
Depends-on: Iacc3f02fdd4f39edb5c95d144ffff00b65baa55a
This commit is contained in:
Sergey Reshetnyak 2016-11-17 15:45:36 +03:00
parent 278d15cc54
commit d4e93847cd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/files/keystone.conf.j2
View File

@ -5,7 +5,7 @@ use_stderr = True
max_token_size = 255 max_token_size = 255
[database] [database]
connection = mysql+pymysql://{{ keystone.db.username }}:{{ keystone.db.password }}@{{ address('mariadb') }}/{{ keystone.db.name }} connection = mysql+pymysql://{{ keystone.db.username }}:{{ keystone.db.password }}@{{ address(service.database) }}/{{ keystone.db.name }}
max_retries = -1 max_retries = -1
max_overflow = 60 max_overflow = 60

4
service/keystone.yaml
View File

@ -21,10 +21,10 @@ service:
command: "sudo /bin/chown keystone:keystone /var/log/ccp/keystone" command: "sudo /bin/chown keystone:keystone /var/log/ccp/keystone"
- name: keystone-db-create - name: keystone-db-create
dependencies: dependencies:
- mariadb - {{ service.database }}
type: single type: single
command: command:
mysql -u root -p{{ db.root_password }} -h {{ address('mariadb') }} -e "create database {{ keystone.db.name }}; mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ keystone.db.name }};
grant all privileges on {{ keystone.db.name }}.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}'; grant all privileges on {{ keystone.db.name }}.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}';
grant super on *.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}';" grant super on *.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}';"
- name: keystone-db-sync - name: keystone-db-sync