openstack/openstack-ansible
Code Issues Proposed changes

Merge "Define galera_address in the all group_vars"

Browse Source
This commit is contained in:
Jenkins 2016-06-30 04:02:39 +00:00 committed by Gerrit Code Review
commit 36646a308d
11 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/galera-install.yml
View File

@ -82,6 +82,8 @@
tags:
- "system-crontab-coordination"
vars:
# overridden here to ensure the correct value for the galera_client role
galera_address: 127.0.0.1
galera_server_id: "{{ inventory_hostname | string_2_int }}"
galera_wsrep_node_name: "{{ container_name }}"
tags:

1
playbooks/inventory/group_vars/all.yml
View File

@ -50,6 +50,7 @@ memcached_port: 11211
memcached_servers: "{% for host in groups['memcached'] %}{{ hostvars[host]['ansible_ssh_host'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}"
## Galera
galera_address: "{{ internal_lb_vip_address }}"
galera_root_user: "root"
## RabbitMQ

1
playbooks/os-cinder-install.yml
View File

@ -239,7 +239,6 @@
tags:
- "system-crontab-coordination"
vars:
galera_address: "{{ internal_lb_vip_address }}"
is_metal: "{{ properties.is_metal|default(false) }}"
cinder_galera_user: cinder
cinder_galera_database: cinder

1
playbooks/os-glance-install.yml
View File

@ -173,7 +173,6 @@
tags:
- "system-crontab-coordination"
vars:
galera_address: "{{ internal_lb_vip_address }}"
is_metal: "{{ properties.is_metal|default(false) }}"
glance_galera_user: glance
glance_galera_database: glance

1
playbooks/os-heat-install.yml
View File

@ -148,7 +148,6 @@
tags:
- "system-crontab-coordination"
vars:
galera_address: "{{ internal_lb_vip_address }}"
is_metal: "{{ properties.is_metal|default(false) }}"
heat_galera_user: heat
heat_galera_database: heat

1
playbooks/os-horizon-install.yml
View File

@ -122,7 +122,6 @@
tags:
- "system-crontab-coordination"
vars:
galera_address: "{{ internal_lb_vip_address }}"
is_metal: "{{ properties.is_metal|default(false) }}"
horizon_galera_user: horizon
horizon_galera_database: horizon

1
playbooks/os-ironic-install.yml
View File

@ -127,7 +127,6 @@
tags:
- "system-crontab-coordination"
vars:
galera_address: "{{ internal_lb_vip_address }}"
is_metal: "{{ properties.is_metal|default(false) }}"
ironic_galera_user: ironic
ironic_galera_database: ironic

2
playbooks/os-keystone-install.yml
View File

@ -166,9 +166,7 @@
tags:
- "system-crontab-coordination"
vars:
galera_address: "{{ internal_lb_vip_address }}"
is_metal: "{{ properties.is_metal|default(false) }}"
galera_root_user: "root"
keystone_admin_port: 35357
keystone_galera_user: keystone
keystone_galera_database: keystone

1
playbooks/os-neutron-install.yml
View File

@ -206,7 +206,6 @@
tags:
- "system-crontab-coordination"
vars:
galera_address: "{{ internal_lb_vip_address }}"
is_metal: "{{ properties.is_metal|default(false) }}"
neutron_galera_user: neutron
neutron_galera_database: neutron

1
playbooks/os-nova-install.yml
View File

@ -277,7 +277,6 @@
vars_files:
- defaults/repo_packages/openstack_other.yml
vars:
galera_address: "{{ internal_lb_vip_address }}"
is_metal: "{{ properties.is_metal|default(false) }}"
nova_galera_user: nova
nova_galera_database: nova

1
playbooks/utility-install.yml
View File

@ -121,7 +121,6 @@
when:
- utility_ssh_private_key is defined
vars:
galera_address: "{{ internal_lb_vip_address }}"
utility_pip_packages:
- python-openstackclient
- python-ceilometerclient