Use group_names to check a host belongs to group
Change-Id: I203fa5a2bee7d3e8e817896d3bb74f946e4f128f
This commit is contained in:
parent
6cf41fe8d1
commit
def3818792
|
@ -42,4 +42,4 @@
|
|||
state: "restarted"
|
||||
daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
|
||||
with_dict: "{{ monasca_services }}"
|
||||
when: inventory_hostname in groups[item.value.group]
|
||||
when: "item.value.group in group_names"
|
||||
|
|
|
@ -44,14 +44,14 @@ dependencies:
|
|||
- ansible_pkg_mgr == 'apt'
|
||||
- role: ansible-zookeeper
|
||||
when:
|
||||
- inventory_hostname in groups['monasca_zookeeper']
|
||||
- "monasca_services['monasca-zookeeper']['group'] in group_names"
|
||||
tags:
|
||||
- zookeeper
|
||||
- skip_ansible_lint
|
||||
- role: ansible-kafka
|
||||
kafka_listen_address: "{{ ansible_host }}"
|
||||
when:
|
||||
- inventory_hostname in groups['monasca_kafka']
|
||||
- "monasca_services['monasca-kafka']['group'] in group_names"
|
||||
tags:
|
||||
- kafka
|
||||
- skip_ansible_lint
|
||||
|
@ -60,13 +60,13 @@ dependencies:
|
|||
storm_supervisor_enabled: True
|
||||
nimbus_host: "{{ ansible_ssh_host }}"
|
||||
when:
|
||||
- inventory_hostname in groups['monasca_api']
|
||||
- "monasca_services['monasca-api']['group'] in group_names"
|
||||
tags:
|
||||
- storm
|
||||
- skip_ansible_lint
|
||||
- role: ansible-influxdb
|
||||
when:
|
||||
- inventory_hostname in groups['monasca_influxdb']
|
||||
- "monasca_services['monasca-influxdb']['group'] in group_names"
|
||||
tags:
|
||||
- influxdb
|
||||
- skip_ansible_lint
|
||||
|
@ -77,7 +77,7 @@ dependencies:
|
|||
grafana_mysql_password: "{{ grafana_galera_password }}"
|
||||
grafana_keystone_url: "{{ keystone_service_internaluri }}"
|
||||
when:
|
||||
- inventory_hostname in groups['monasca_grafana']
|
||||
- "monasca_services['monasca-grafana']['group'] in group_names"
|
||||
tags:
|
||||
- grafana
|
||||
- skip_ansible_lint
|
||||
|
|
|
@ -29,27 +29,27 @@
|
|||
- always
|
||||
|
||||
- include: monasca_pre_install.yml
|
||||
when: inventory_hostname in groups['monasca_api']
|
||||
when: "monasca_services['monasca-api']['group'] in group_names"
|
||||
tags:
|
||||
- monasca-install
|
||||
|
||||
- include: monasca_install.yml
|
||||
when: inventory_hostname in groups['monasca_api']
|
||||
when: "monasca_services['monasca-api']['group'] in group_names"
|
||||
tags:
|
||||
- monasca-install
|
||||
|
||||
- include: monasca_thresh_install.yml
|
||||
when: inventory_hostname in groups['monasca_api']
|
||||
when: "monasca_services['monasca-api']['group'] in group_names"
|
||||
tags:
|
||||
- monasca-install
|
||||
|
||||
- include: monasca_post_install.yml
|
||||
when: inventory_hostname in groups['monasca_api']
|
||||
when: "monasca_services['monasca-api']['group'] in group_names"
|
||||
tags:
|
||||
- monasca-config
|
||||
|
||||
- include: monasca_init_{{ ansible_service_mgr }}.yml
|
||||
when: inventory_hostname in groups['monasca_api']
|
||||
when: "monasca_services['monasca-api']['group'] in group_names"
|
||||
tags:
|
||||
- monasca-config
|
||||
|
||||
|
|
|
@ -12,10 +12,10 @@
|
|||
# limitations under the License.
|
||||
|
||||
- include: monasca_influxdb_setup.yml
|
||||
when: inventory_hostname in groups['monasca_influxdb']
|
||||
when: "monasca_services['monasca-influxdb']['group'] in group_names"
|
||||
|
||||
- include: monasca_mysql_setup.yml
|
||||
when: inventory_hostname in groups['monasca_api']
|
||||
when: "monasca_services['monasca-api']['group'] in group_names"
|
||||
|
||||
- include: monasca_kafka_setup.yml
|
||||
when: inventory_hostname in groups['monasca_kafka']
|
||||
when: "monasca_services['monasca-kafka']['group'] in group_names"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
group: "{{ monasca_system_group_name }}"
|
||||
mode: "02755"
|
||||
with_dict: "{{ monasca_services }}"
|
||||
when: inventory_hostname in groups[item.value.group]
|
||||
when: "item.value.group in group_names"
|
||||
|
||||
- name: Create TEMP lock dir
|
||||
file:
|
||||
|
@ -31,7 +31,7 @@
|
|||
group: "{{ monasca_system_group_name }}"
|
||||
mode: "02755"
|
||||
with_dict: "{{ monasca_services }}"
|
||||
when: inventory_hostname in groups[item.value.group]
|
||||
when: "item.value.group in group_names"
|
||||
|
||||
# TODO:
|
||||
# Remove this in Pike as it only needed to handle upgrades
|
||||
|
@ -41,7 +41,7 @@
|
|||
path: "/etc/tmpfiles.d/{{ item.value.service_name }}.conf"
|
||||
state: absent
|
||||
with_dict: "{{ monasca_services }}"
|
||||
when: inventory_hostname in groups[item.value.group]
|
||||
when: "item.value.group in group_names"
|
||||
|
||||
- name: Create tmpfiles.d entry
|
||||
template:
|
||||
|
@ -51,7 +51,7 @@
|
|||
owner: "root"
|
||||
group: "root"
|
||||
with_dict: "{{ monasca_services }}"
|
||||
when: inventory_hostname in groups[item.value.group]
|
||||
when: "item.value.group in group_names"
|
||||
notify:
|
||||
- Restart monasca services
|
||||
|
||||
|
@ -65,6 +65,6 @@
|
|||
config_overrides: "{{ item.value.init_config_overrides }}"
|
||||
config_type: "ini"
|
||||
with_dict: "{{ monasca_services }}"
|
||||
when: inventory_hostname in groups[item.value.group]
|
||||
when: "item.value.group in group_names"
|
||||
notify:
|
||||
- Restart monasca services
|
||||
|
|
Loading…
Reference in New Issue