Commit 175b031b by Calen Pennington Committed by zubair-arbi

Use configuration to specify whether db users are granted to localhost or %

parent 094c1968
...@@ -3,4 +3,5 @@ course_discovery_gunicorn_host: 0.0.0.0 ...@@ -3,4 +3,5 @@ course_discovery_gunicorn_host: 0.0.0.0
COURSE_DISCOVERY_MYSQL: 'db' COURSE_DISCOVERY_MYSQL: 'db'
COURSE_DISCOVERY_DJANGO_SETTINGS_MODULE: 'course_discovery.settings.devstack' COURSE_DISCOVERY_DJANGO_SETTINGS_MODULE: 'course_discovery.settings.devstack'
COURSE_DISCOVERY_ELASTICSEARCH_HOST: 'es' COURSE_DISCOVERY_ELASTICSEARCH_HOST: 'es'
COURSE_DISCOVERY_MYSQL_LOGIN_HOST: '%'
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
credentials_gunicorn_host: 127.0.0.1 credentials_gunicorn_host: 127.0.0.1
CREDENTIALS_MYSQL: 'db' CREDENTIALS_MYSQL: 'db'
CREDENTIALS_DJANGO_SETTINGS_MODULE: 'credentials.settings.devstack' CREDENTIALS_DJANGO_SETTINGS_MODULE: 'credentials.settings.devstack'
CREDENTIALS_MYSQL_LOGIN_HOST: '%'
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
{{ role_name|upper }}_DB_ADMIN_USER: 'root' {{ role_name|upper }}_DB_ADMIN_USER: 'root'
{{ role_name|upper }}_DB_ADMIN_PASSWORD: '' {{ role_name|upper }}_DB_ADMIN_PASSWORD: ''
{{ role_name|upper }}_MYSQL_LOGIN_HOST: 'localhost'
{{ role_name|upper }}_MEMCACHE: [ 'memcache' ] {{ role_name|upper }}_MEMCACHE: [ 'memcache' ]
......
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
{{ role_name }}_gunicorn_host: 127.0.0.1 {{ role_name }}_gunicorn_host: 127.0.0.1
{{ role_name|upper }}_MYSQL: 'db' {{ role_name|upper }}_MYSQL: 'db'
{{ role_name|upper }}_DJANGO_SETTINGS_MODULE: '{{ role_name }}.settings.devstack' {{ role_name|upper }}_DJANGO_SETTINGS_MODULE: '{{ role_name }}.settings.devstack'
{{ role_name|upper }}_MYSQL_LOGIN_HOST: '%'
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
login_user: "{{ '{{' }} {{ role_name|upper }}_DB_ADMIN_USER }}" login_user: "{{ '{{' }} {{ role_name|upper }}_DB_ADMIN_USER }}"
login_password: "{{ '{{' }} {{ role_name|upper }}_DB_ADMIN_PASSWORD }}" login_password: "{{ '{{' }} {{ role_name|upper }}_DB_ADMIN_PASSWORD }}"
name: "{{ '{{' }} item.name }}" name: "{{ '{{' }} item.name }}"
host: "%" host: "{{ '{{' }} {{ role_name|upper }}_MYSQL_LOGIN_HOST }}"
password: "{{ '{{' }} item.password }}" password: "{{ '{{' }} item.password }}"
priv: "{{ '{{' }} {{ role_name|upper }}_DEFAULT_DB_NAME }}.*:ALL" priv: "{{ '{{' }} {{ role_name|upper }}_DEFAULT_DB_NAME }}.*:ALL"
with_items: with_items:
......
...@@ -46,6 +46,7 @@ COURSE_DISCOVERY_ELASTICSEARCH: ...@@ -46,6 +46,7 @@ COURSE_DISCOVERY_ELASTICSEARCH:
COURSE_DISCOVERY_DB_ADMIN_USER: 'root' COURSE_DISCOVERY_DB_ADMIN_USER: 'root'
COURSE_DISCOVERY_DB_ADMIN_PASSWORD: '' COURSE_DISCOVERY_DB_ADMIN_PASSWORD: ''
COURSE_DISCOVERY_MYSQL_LOGIN_HOST: 'localhost'
COURSE_DISCOVERY_MEMCACHE: [ 'memcache' ] COURSE_DISCOVERY_MEMCACHE: [ 'memcache' ]
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
login_user: "{{ COURSE_DISCOVERY_DB_ADMIN_USER }}" login_user: "{{ COURSE_DISCOVERY_DB_ADMIN_USER }}"
login_password: "{{ COURSE_DISCOVERY_DB_ADMIN_PASSWORD }}" login_password: "{{ COURSE_DISCOVERY_DB_ADMIN_PASSWORD }}"
name: "{{ item.name }}" name: "{{ item.name }}"
host: "%" host: "{{ COURSE_DISCOVERY_MYSQL_LOGIN_HOST }}"
password: "{{ item.password }}" password: "{{ item.password }}"
priv: "{{ COURSE_DISCOVERY_DEFAULT_DB_NAME }}.*:ALL" priv: "{{ COURSE_DISCOVERY_DEFAULT_DB_NAME }}.*:ALL"
with_items: with_items:
......
...@@ -39,6 +39,7 @@ CREDENTIALS_DATABASES: ...@@ -39,6 +39,7 @@ CREDENTIALS_DATABASES:
CREDENTIALS_DB_ADMIN_USER: 'root' CREDENTIALS_DB_ADMIN_USER: 'root'
CREDENTIALS_DB_ADMIN_PASSWORD: '' CREDENTIALS_DB_ADMIN_PASSWORD: ''
CREDENTIALS_MYSQL_LOGIN_HOST: 'localhost'
CREDENTIALS_MEMCACHE: [ 'memcache' ] CREDENTIALS_MEMCACHE: [ 'memcache' ]
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
login_user: "{{ CREDENTIALS_DB_ADMIN_USER }}" login_user: "{{ CREDENTIALS_DB_ADMIN_USER }}"
login_password: "{{ CREDENTIALS_DB_ADMIN_PASSWORD }}" login_password: "{{ CREDENTIALS_DB_ADMIN_PASSWORD }}"
name: "{{ item.name }}" name: "{{ item.name }}"
host: "%" host: "{{ CREDENTIALS_MYSQL_LOGIN_HOST }}"
password: "{{ item.password }}" password: "{{ item.password }}"
priv: "{{ CREDENTIALS_DEFAULT_DB_NAME }}.*:ALL" priv: "{{ CREDENTIALS_DEFAULT_DB_NAME }}.*:ALL"
with_items: with_items:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment