Merge "Move database creation into role (horizon)"

This commit is contained in:
Zuul 2018-06-20 16:04:55 +00:00 committed by Gerrit Code Review
commit d507f6fbcc

View File

@ -17,6 +17,9 @@
hosts: horizon_all
gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- horizon
pre_tasks:
- include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
- include: common-tasks/os-log-dir-setup.yml
@ -24,14 +27,7 @@
log_dirs:
- src: "/openstack/log/{{ inventory_hostname }}-horizon"
dest: "/var/log/horizon"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ horizon_galera_user }}"
password: "{{ horizon_container_mysql_password }}"
login_host: "{{ horizon_galera_address }}"
db_name: "{{ horizon_galera_database }}"
when: inventory_hostname == groups['horizon_all'][0]
- include: common-tasks/unbound-clients.yml
static: no
when:
@ -48,11 +44,3 @@
rsyslog_client_log_rotate_file: horizon_log_rotate
rsyslog_client_log_dir: "/var/log/horizon"
rsyslog_client_config_name: "99-horizon-rsyslog-client.conf"
vars:
horizon_galera_user: horizon
horizon_galera_database: horizon
horizon_galera_address: "{{ galera_address }}"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- horizon