Merge "Configure DB addresses for each service"

README.rst

@@ -16,4 +16,4 @@ This role will install the following:
       roles:
         - { role: "os_horizon", tags: [ "os-horizon" ] }
       vars:
-        galera_address: "{{ internal_lb_vip_address }}"
+        horizon_galera_address: "{{ internal_lb_vip_address }}"

tasks/horizon_db_setup.yml

@@ -17,7 +17,7 @@
   mysql_db:
     login_user: "{{ galera_root_user }}"
     login_password: "{{ galera_root_password }}"
-    login_host: "{{ galera_address }}"
+    login_host: "{{ horizon_galera_address }}"
     name: "{{ horizon_galera_database }}"
     state: "present"
   tags:
@@ -27,7 +27,7 @@
   mysql_user:
     login_user: "{{ galera_root_user }}"
     login_password: "{{ galera_root_password }}"
-    login_host: "{{ galera_address }}"
+    login_host: "{{ horizon_galera_address }}"
     name: "{{ horizon_galera_user }}"
     password: "{{ horizon_container_mysql_password }}"
     host: "{{ item }}"

templates/horizon_local_settings.py.j2

@@ -136,7 +136,7 @@ SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'HOST': '{{ galera_address }}',
+        'HOST': '{{ horizon_galera_address }}',
         'NAME': '{{ horizon_galera_database }}',
         'USER': '{{ horizon_galera_user }}',
         'PASSWORD': '{{ horizon_container_mysql_password }}',