From d4e93847cda48f7d1ed8ee9c2cb66b5775b11ba6 Mon Sep 17 00:00:00 2001 From: Sergey Reshetnyak Date: Thu, 17 Nov 2016 15:45:36 +0300 Subject: [PATCH] Use database service name from config Change-Id: Icf97a02ed235e93cde45fdc94a50049cb38f69a9 Depends-on: Iacc3f02fdd4f39edb5c95d144ffff00b65baa55a --- service/files/keystone.conf.j2 | 2 +- service/keystone.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/service/files/keystone.conf.j2 b/service/files/keystone.conf.j2 index 7bfab90..2b8dca4 100644 --- a/service/files/keystone.conf.j2 +++ b/service/files/keystone.conf.j2 @@ -5,7 +5,7 @@ use_stderr = True max_token_size = 255 [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_overflow = 60 diff --git a/service/keystone.yaml b/service/keystone.yaml index 751c712..0492fa6 100644 --- a/service/keystone.yaml +++ b/service/keystone.yaml @@ -21,10 +21,10 @@ service: command: "sudo /bin/chown keystone:keystone /var/log/ccp/keystone" - name: keystone-db-create dependencies: - - mariadb + - {{ service.database }} type: single 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 super on *.* to '{{ keystone.db.username }}'@'%' identified by '{{ keystone.db.password }}';" - name: keystone-db-sync