diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index c5de4ecc7d..1e0626ac4a 100644 --- a/playbooks/os-cinder-install.yml +++ b/playbooks/os-cinder-install.yml @@ -98,7 +98,7 @@ - "cinder-rsyslog-client" - "rsyslog-client" vars: - galera_address: "{{ internal_lb_vip_address }}" + cinder_galera_address: "{{ internal_lb_vip_address }}" glance_host: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" cinder_storage_address: "{{ container_address }}" diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index f7ed212f90..98f2bcee1f 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -82,6 +82,6 @@ - "glance-rsyslog-client" - "rsyslog-client" vars: - galera_address: "{{ internal_lb_vip_address }}" + glance_galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" is_metal: "{{ properties.is_metal|default(false) }}" diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index 68a1c38a72..f9b5113e98 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -57,7 +57,7 @@ - "heat-rsyslog-client" - "rsyslog-client" vars: - galera_address: "{{ internal_lb_vip_address }}" + heat_galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" is_metal: "{{ properties.is_metal|default(false) }}" vars_files: diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index 53d6622368..58fd177d6c 100644 --- a/playbooks/os-horizon-install.yml +++ b/playbooks/os-horizon-install.yml @@ -57,7 +57,7 @@ - "horizon-rsyslog-client" - "rsyslog-client" vars: - galera_address: "{{ internal_lb_vip_address }}" + horizon_galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" horizon_server_name: "{{ container_name }}" is_metal: "{{ properties.is_metal|default(false) }}" diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index c34c2e5893..8a303caa5d 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -58,6 +58,6 @@ - "keystone-rsyslog-client" - "rsyslog-client" vars: - galera_address: "{{ internal_lb_vip_address }}" + keystone_galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" is_metal: "{{ properties.is_metal|default(false) }}" diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index fe3e3b03d6..1288f5f45e 100644 --- a/playbooks/os-neutron-install.yml +++ b/playbooks/os-neutron-install.yml @@ -103,7 +103,7 @@ - "neutron-rsyslog-client" - "rsyslog-client" vars: - galera_address: "{{ internal_lb_vip_address }}" + neutron_galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" is_metal: "{{ properties.is_metal|default(false) }}" bind_prefix: "{{ provider_network_bind_prefix|default('') }}" diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index 249e847ef8..dbe3b24a6f 100644 --- a/playbooks/os-nova-install.yml +++ b/playbooks/os-nova-install.yml @@ -99,7 +99,7 @@ - "nova-rsyslog-client" - "rsyslog-client" vars: - galera_address: "{{ internal_lb_vip_address }}" + nova_galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" ansible_ssh_host: "{{ container_address }}" is_metal: "{{ properties.is_metal|default(false) }}" diff --git a/playbooks/roles/os_cinder/README.rst b/playbooks/roles/os_cinder/README.rst index 5ed16b73ef..3b7b241f88 100644 --- a/playbooks/roles/os_cinder/README.rst +++ b/playbooks/roles/os_cinder/README.rst @@ -18,4 +18,4 @@ This role will install the following: roles: - { role: "os_cinder", tags: [ "os-cinder" ] } vars: - galera_address: "{{ internal_lb_vip_address }}" + cinder_galera_address: "{{ internal_lb_vip_address }}" diff --git a/playbooks/roles/os_cinder/tasks/cinder_db_setup.yml b/playbooks/roles/os_cinder/tasks/cinder_db_setup.yml index b33274de89..635c4a77c9 100644 --- a/playbooks/roles/os_cinder/tasks/cinder_db_setup.yml +++ b/playbooks/roles/os_cinder/tasks/cinder_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: "{{ cinder_galera_address }}" name: "{{ cinder_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: "{{ cinder_galera_address }}" name: "{{ cinder_galera_user }}" password: "{{ cinder_container_mysql_password }}" host: "{{ item }}" diff --git a/playbooks/roles/os_cinder/templates/cinder.conf.j2 b/playbooks/roles/os_cinder/templates/cinder.conf.j2 index 228206bae0..5a13b2b746 100644 --- a/playbooks/roles/os_cinder/templates/cinder.conf.j2 +++ b/playbooks/roles/os_cinder/templates/cinder.conf.j2 @@ -92,7 +92,7 @@ nfs_shares_config={{ cinder_nfs_client.nfs_shares_config }} {% endif %} [database] -connection = mysql://{{ cinder_galera_user }}:{{ cinder_container_mysql_password }}@{{ galera_address }}/{{ cinder_galera_database }}?charset=utf8 +connection = mysql://{{ cinder_galera_user }}:{{ cinder_container_mysql_password }}@{{ cinder_galera_address }}/{{ cinder_galera_database }}?charset=utf8 [oslo_messaging_rabbit] rabbit_port = {{ rabbitmq_port }} diff --git a/playbooks/roles/os_glance/README.rst b/playbooks/roles/os_glance/README.rst index b740f7eeb2..b6bca9126f 100644 --- a/playbooks/roles/os_glance/README.rst +++ b/playbooks/roles/os_glance/README.rst @@ -19,4 +19,4 @@ This role will install the following: vars: external_lb_vip_address: 172.16.24.1 internal_lb_vip_address: 192.168.0.1 - galera_address: "{{ internal_lb_vip_address }}" + glance_galera_address: "{{ internal_lb_vip_address }}" diff --git a/playbooks/roles/os_glance/tasks/glance_db_setup.yml b/playbooks/roles/os_glance/tasks/glance_db_setup.yml index c5a67590e5..bf22377305 100644 --- a/playbooks/roles/os_glance/tasks/glance_db_setup.yml +++ b/playbooks/roles/os_glance/tasks/glance_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: "{{ glance_galera_address }}" name: "{{ glance_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: "{{ glance_galera_address }}" name: "{{ glance_galera_user }}" password: "{{ glance_container_mysql_password }}" host: "{{ item }}" diff --git a/playbooks/roles/os_glance/templates/glance-api.conf.j2 b/playbooks/roles/os_glance/templates/glance-api.conf.j2 index 7594b10f89..4f85c69c90 100644 --- a/playbooks/roles/os_glance/templates/glance-api.conf.j2 +++ b/playbooks/roles/os_glance/templates/glance-api.conf.j2 @@ -48,7 +48,7 @@ image_cache_dir = {{ glance_system_user_home }}/cache/ task_executor = {{ glance_task_executor }} [database] -connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ galera_address }}/{{ glance_galera_database }}?charset=utf8 +connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 [keystone_authtoken] auth_plugin = {{ glance_keystone_auth_plugin }} diff --git a/playbooks/roles/os_glance/templates/glance-manage.conf.j2 b/playbooks/roles/os_glance/templates/glance-manage.conf.j2 index 33c5689ee2..19c6113b90 100644 --- a/playbooks/roles/os_glance/templates/glance-manage.conf.j2 +++ b/playbooks/roles/os_glance/templates/glance-manage.conf.j2 @@ -6,4 +6,4 @@ fatal_deprecations = {{ glance_fatal_deprecations }} use_syslog = False [database] -connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ galera_address }}/{{ glance_galera_database }}?charset=utf8 +connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 diff --git a/playbooks/roles/os_glance/templates/glance-registry.conf.j2 b/playbooks/roles/os_glance/templates/glance-registry.conf.j2 index fdc0a5ea81..66ce65cbe5 100644 --- a/playbooks/roles/os_glance/templates/glance-registry.conf.j2 +++ b/playbooks/roles/os_glance/templates/glance-registry.conf.j2 @@ -18,7 +18,7 @@ api_limit_max = 1000 limit_param_default = 25 [database] -connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ galera_address }}/{{ glance_galera_database }}?charset=utf8 +connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8 [keystone_authtoken] auth_plugin = {{ glance_keystone_auth_plugin }} diff --git a/playbooks/roles/os_heat/README.rst b/playbooks/roles/os_heat/README.rst index 050745cf8d..553835f107 100644 --- a/playbooks/roles/os_heat/README.rst +++ b/playbooks/roles/os_heat/README.rst @@ -21,6 +21,6 @@ This role will install the following: vars: external_lb_vip_address: 172.16.24.1 internal_lb_vip_address: 192.168.0.1 - galera_address: "{{ internal_lb_vip_address }}" + heat_galera_address: "{{ internal_lb_vip_address }}" keystone_admin_user_name: admin keystone_admin_tenant_name: admin diff --git a/playbooks/roles/os_heat/tasks/heat_db_setup.yml b/playbooks/roles/os_heat/tasks/heat_db_setup.yml index 022e72052a..ae1b40ebb1 100644 --- a/playbooks/roles/os_heat/tasks/heat_db_setup.yml +++ b/playbooks/roles/os_heat/tasks/heat_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: "{{ heat_galera_address }}" name: "{{ heat_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: "{{ heat_galera_address }}" name: "{{ heat_galera_user }}" password: "{{ heat_container_mysql_password }}" host: "{{ item }}" diff --git a/playbooks/roles/os_heat/templates/heat.conf.j2 b/playbooks/roles/os_heat/templates/heat.conf.j2 index aaa5532a33..7d63e3d918 100644 --- a/playbooks/roles/os_heat/templates/heat.conf.j2 +++ b/playbooks/roles/os_heat/templates/heat.conf.j2 @@ -35,7 +35,7 @@ endpoint_type = {{ heat_clients_endpoint }} endpoint_type = {{ heat_clients_heat_endpoint }} [database] -connection = mysql://{{ heat_galera_user }}:{{ heat_container_mysql_password }}@{{ galera_address }}/{{ heat_galera_database }}?charset=utf8 +connection = mysql://{{ heat_galera_user }}:{{ heat_container_mysql_password }}@{{ heat_galera_address }}/{{ heat_galera_database }}?charset=utf8 [ec2authtoken] auth_uri = {{ keystone_service_internalurl }} diff --git a/playbooks/roles/os_horizon/README.rst b/playbooks/roles/os_horizon/README.rst index 54ea7770de..221bd2d338 100644 --- a/playbooks/roles/os_horizon/README.rst +++ b/playbooks/roles/os_horizon/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 }}" diff --git a/playbooks/roles/os_horizon/tasks/horizon_db_setup.yml b/playbooks/roles/os_horizon/tasks/horizon_db_setup.yml index 9d9f1492a6..d1198faf81 100644 --- a/playbooks/roles/os_horizon/tasks/horizon_db_setup.yml +++ b/playbooks/roles/os_horizon/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 }}" diff --git a/playbooks/roles/os_horizon/templates/horizon_local_settings.py.j2 b/playbooks/roles/os_horizon/templates/horizon_local_settings.py.j2 index 833daab6b3..ec48506e17 100644 --- a/playbooks/roles/os_horizon/templates/horizon_local_settings.py.j2 +++ b/playbooks/roles/os_horizon/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 }}', diff --git a/playbooks/roles/os_keystone/README.rst b/playbooks/roles/os_keystone/README.rst index d3deff18cf..41dcafa8ce 100644 --- a/playbooks/roles/os_keystone/README.rst +++ b/playbooks/roles/os_keystone/README.rst @@ -19,4 +19,4 @@ This role will install the following: vars: external_lb_vip_address: 172.16.24.1 internal_lb_vip_address: 192.168.0.1 - galera_address: "{{ internal_lb_vip_address }}" + keystone_galera_address: "{{ internal_lb_vip_address }}" diff --git a/playbooks/roles/os_keystone/tasks/keystone_db_setup.yml b/playbooks/roles/os_keystone/tasks/keystone_db_setup.yml index 8b1c92e9b1..9bdf171a5a 100644 --- a/playbooks/roles/os_keystone/tasks/keystone_db_setup.yml +++ b/playbooks/roles/os_keystone/tasks/keystone_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: "{{ keystone_galera_address }}" name: "{{ keystone_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: "{{ keystone_galera_address }}" name: "{{ keystone_galera_user }}" password: "{{ keystone_container_mysql_password }}" host: "{{ item }}" diff --git a/playbooks/roles/os_keystone/templates/keystone.conf.j2 b/playbooks/roles/os_keystone/templates/keystone.conf.j2 index 520e89095d..90f00ca4e1 100644 --- a/playbooks/roles/os_keystone/templates/keystone.conf.j2 +++ b/playbooks/roles/os_keystone/templates/keystone.conf.j2 @@ -47,7 +47,7 @@ methods = {{ keystone_auth_methods }} [database] -connection = mysql://{{ keystone_galera_user }}:{{ keystone_container_mysql_password }}@{{ galera_address }}/{{ keystone_galera_database }}?charset=utf8 +connection = mysql://{{ keystone_galera_user }}:{{ keystone_container_mysql_password }}@{{ keystone_galera_address }}/{{ keystone_galera_database }}?charset=utf8 idle_timeout = {{ keystone_database_idle_timeout }} min_pool_size = {{ keystone_database_min_pool_size }} max_pool_size = {{ keystone_database_max_pool_size }} diff --git a/playbooks/roles/os_neutron/README.rst b/playbooks/roles/os_neutron/README.rst index 82143fdfa0..7ade32f019 100644 --- a/playbooks/roles/os_neutron/README.rst +++ b/playbooks/roles/os_neutron/README.rst @@ -17,4 +17,4 @@ This role will install the following: roles: - { role: "os_neutron", tags: [ "os-neutron" ] } vars: - galera_address: "{{ internal_lb_vip_address }}" + neutron_galera_address: "{{ internal_lb_vip_address }}" diff --git a/playbooks/roles/os_neutron/tasks/neutron_db_setup.yml b/playbooks/roles/os_neutron/tasks/neutron_db_setup.yml index 4837a825ad..de7b775b07 100644 --- a/playbooks/roles/os_neutron/tasks/neutron_db_setup.yml +++ b/playbooks/roles/os_neutron/tasks/neutron_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: "{{ neutron_galera_address }}" name: "{{ neutron_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: "{{ neutron_galera_address }}" name: "{{ neutron_galera_user }}" password: "{{ neutron_container_mysql_password }}" host: "{{ item }}" diff --git a/playbooks/roles/os_neutron/templates/neutron.conf.j2 b/playbooks/roles/os_neutron/templates/neutron.conf.j2 index 23d976385e..80d934d820 100644 --- a/playbooks/roles/os_neutron/templates/neutron.conf.j2 +++ b/playbooks/roles/os_neutron/templates/neutron.conf.j2 @@ -119,7 +119,7 @@ check_revocations_for_cached = False {% if inventory_hostname in groups['neutron_server'] %} [database] -connection = mysql://{{ neutron_galera_user }}:{{ neutron_container_mysql_password }}@{{ galera_address }}/{{ neutron_galera_database }}?charset=utf8 +connection = mysql://{{ neutron_galera_user }}:{{ neutron_container_mysql_password }}@{{ neutron_galera_address }}/{{ neutron_galera_database }}?charset=utf8 {% endif %} diff --git a/playbooks/roles/os_nova/README.rst b/playbooks/roles/os_nova/README.rst index 7b0317c0b5..69cef3a806 100644 --- a/playbooks/roles/os_nova/README.rst +++ b/playbooks/roles/os_nova/README.rst @@ -24,4 +24,4 @@ This role will install the following: roles: - { role: "os_nova", tags: [ "os-nova" ] } vars: - galera_address: "{{ internal_lb_vip_address }}" + nova_galera_address: "{{ internal_lb_vip_address }}" diff --git a/playbooks/roles/os_nova/tasks/nova_db_setup.yml b/playbooks/roles/os_nova/tasks/nova_db_setup.yml index 09d98a2bad..d88d564dde 100644 --- a/playbooks/roles/os_nova/tasks/nova_db_setup.yml +++ b/playbooks/roles/os_nova/tasks/nova_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: "{{ nova_galera_address }}" name: "{{ nova_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: "{{ nova_galera_address }}" name: "{{ nova_galera_user }}" password: "{{ nova_container_mysql_password }}" host: "{{ item }}" diff --git a/playbooks/roles/os_nova/templates/nova.conf.j2 b/playbooks/roles/os_nova/templates/nova.conf.j2 index 7316629ebd..29d701a727 100644 --- a/playbooks/roles/os_nova/templates/nova.conf.j2 +++ b/playbooks/roles/os_nova/templates/nova.conf.j2 @@ -176,7 +176,7 @@ check_revocations_for_cached = False {% if inventory_hostname not in groups['nova_compute'] %} [database] -connection = mysql://{{ nova_galera_user }}:{{ nova_container_mysql_password }}@{{ galera_address }}/{{ nova_galera_database }}?charset=utf8 +connection = mysql://{{ nova_galera_user }}:{{ nova_container_mysql_password }}@{{ nova_galera_address }}/{{ nova_galera_database }}?charset=utf8 max_overflow = {{ nova_db_max_overflow }} max_pool_size = {{ nova_db_max_pool_size }} pool_timeout = {{ nova_db_pool_timeout }} diff --git a/playbooks/roles/os_swift/README.rst b/playbooks/roles/os_swift/README.rst index cb24ccd935..ddc20ec596 100644 --- a/playbooks/roles/os_swift/README.rst +++ b/playbooks/roles/os_swift/README.rst @@ -18,4 +18,3 @@ This role will install the following: vars: external_lb_vip_address: 172.16.24.1 internal_lb_vip_address: 192.168.0.1 - galera_address: "{{ internal_lb_vip_address }}"