From 93f89e25ce92b5e51f79e6a01ba24f2daacb8aa2 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 31 Jul 2015 15:51:06 +0100 Subject: [PATCH] Add galera_address to all playbooks installing galera_client This patch includes the galera_address var for each playbook that deploys a role depending on galera_client and thereby dropping a .my.cnf onto the target. Prior to this patch the .my.cnf would be dropped with the galera_client's role default of 127.0.0.1 as the host address. The address of 127.0.0.1 is intentionally left to deploy on the galera servers so that the .my.cnf will be configured to interact with the local database. Change-Id: Ife33c68d825ecf1e6cdb6784802e9a099eb54289 Closes-Bug: #1487353 --- playbooks/os-ceilometer-install.yml | 1 + playbooks/os-cinder-install.yml | 1 + playbooks/os-glance-install.yml | 1 + playbooks/os-heat-install.yml | 1 + playbooks/os-horizon-install.yml | 1 + playbooks/os-keystone-install.yml | 1 + playbooks/os-neutron-install.yml | 1 + playbooks/os-nova-install.yml | 1 + 8 files changed, 8 insertions(+) diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index 7fb4a6c69c..92a3cbeaae 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/playbooks/os-ceilometer-install.yml @@ -70,5 +70,6 @@ tags: - "ceilometer-rsyslog-client" vars: + galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" is_metal: "{{ properties.is_metal|default(false) }}" diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index 8c19632792..3048476081 100644 --- a/playbooks/os-cinder-install.yml +++ b/playbooks/os-cinder-install.yml @@ -128,6 +128,7 @@ tags: - "system-crontab-coordination" vars: + galera_address: "{{ internal_lb_vip_address }}" cinder_galera_address: "{{ internal_lb_vip_address }}" glance_host: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index 394ab8db07..6bbdc0e76d 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -90,6 +90,7 @@ tags: - "system-crontab-coordination" 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 641be0e9d0..89c0877398 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -60,6 +60,7 @@ tags: - "system-crontab-coordination" 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) }}" diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index 295c9afe67..8e5abb4cbf 100644 --- a/playbooks/os-horizon-install.yml +++ b/playbooks/os-horizon-install.yml @@ -60,6 +60,7 @@ tags: - "system-crontab-coordination" vars: + galera_address: "{{ internal_lb_vip_address }}" horizon_galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" horizon_server_name: "{{ container_name }}" diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index 3911dab8f1..bef8b5de24 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -61,6 +61,7 @@ tags: - "system-crontab-coordination" 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 503ff4afdd..fcae3dd27f 100644 --- a/playbooks/os-neutron-install.yml +++ b/playbooks/os-neutron-install.yml @@ -106,6 +106,7 @@ tags: - "system-crontab-coordination" 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) }}" diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index e394544c36..c7d71ed36a 100644 --- a/playbooks/os-nova-install.yml +++ b/playbooks/os-nova-install.yml @@ -107,6 +107,7 @@ tags: - "system-crontab-coordination" vars: + galera_address: "{{ internal_lb_vip_address }}" nova_galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" ansible_ssh_host: "{{ container_address }}"