Performance: Don't notify handlers during config

This patch builds upon genconfig optimisation and it takes it
further by not having genconfig ever touch the handlers!
Calling the handlers and skipping them created an unnecessary slow down
if only config was ran. It also depends on the config checking fix.

This gets us closer to the single responsibility principle -
config only generates the config, container checks only validate
whether container restart is needed.

And this also means that we will have single place were containers
are restarted, were we can fix the ansible quirk of it restarting
the whole group even when one container changed in the following patches.

The only exception is the loadbalance role. As the loadbalancer services
have their config altered by other roles registering their services
using loadbalancer-config. This is in contrast to typical roles,
which do config in one step and can then run check-containers in
the next step.

Fixes some handlers that were missing the necessary guard,
making genconfig actually able to restart some containers.

Future work:
- optimise config by doing local generation and mass rsync
- support for reloads
- unconditional restart/reload (separate action)
- make 'reconfigure' act like 'genconfig' + 'deploy-containers'
  - this would avoid calling bootstrapping each time but might
    be tricky as it would break current compatibility
  - could call this 'reconfigure-containers' and deprecate
    'reconfigure'
- fix the ansible quirk that notifies more handlers then intended

Change-Id: I0ce24043ae5486b2b55489ba40abe2b96b0991a6
Partially-Implements: blueprint performance-improvements
Co-Authored-By: Roman Krček <roman.krcek@tietoevry.com>
This commit is contained in:
Radosław Piliszek 2020-07-31 17:54:52 +02:00 committed by Michal Arbet
parent 006ff07185
commit 53376aed8f
104 changed files with 31 additions and 845 deletions

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart aodh-evaluator container - name: Restart aodh-evaluator container
vars: vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart aodh-listener container - name: Restart aodh-listener container
vars: vars:
@ -44,8 +40,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart aodh-notifier container - name: Restart aodh-notifier container
vars: vars:
@ -60,5 +54,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -37,8 +37,6 @@
when: when:
- aodh_policy_file is defined - aodh_policy_file is defined
with_dict: "{{ aodh_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ aodh_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:
@ -51,8 +49,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ aodh_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ aodh_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over aodh.conf - name: Copying over aodh.conf
vars: vars:
@ -68,8 +64,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ aodh_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ aodh_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over wsgi-aodh files for services - name: Copying over wsgi-aodh files for services
vars: vars:
@ -80,5 +74,3 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart aodh-api container"

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart barbican-keystone-listener container - name: Restart barbican-keystone-listener container
vars: vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart barbican-worker container - name: Restart barbican-worker container
vars: vars:
@ -44,5 +40,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -53,8 +53,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ barbican_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ barbican_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over barbican-api.ini - name: Copying over barbican-api.ini
vars: vars:
@ -68,8 +66,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart barbican-api container
- name: Checking whether barbican-api-paste.ini file exists - name: Checking whether barbican-api-paste.ini file exists
vars: vars:
@ -92,8 +88,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- check_barbican_api_paste_ini.stat.exists - check_barbican_api_paste_ini.stat.exists
notify:
- Restart barbican-api container
- name: Copying over barbican.conf - name: Copying over barbican.conf
vars: vars:
@ -109,8 +103,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ barbican_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ barbican_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -121,5 +113,3 @@
when: when:
- barbican_policy_file is defined - barbican_policy_file is defined
with_dict: "{{ barbican_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ barbican_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart blazar-manager container - name: Restart blazar-manager container
vars: vars:
@ -28,5 +26,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -39,8 +39,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ blazar_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ blazar_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over blazar.conf - name: Copying over blazar.conf
vars: vars:
@ -56,8 +54,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ blazar_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ blazar_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -68,5 +64,3 @@
when: when:
- blazar_policy_file is defined - blazar_policy_file is defined
with_dict: "{{ blazar_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ blazar_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart ceilometer-central container - name: Restart ceilometer-central container
vars: vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart ceilometer-compute container - name: Restart ceilometer-compute container
vars: vars:
@ -45,8 +41,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart ceilometer-ipmi container - name: Restart ceilometer-ipmi container
vars: vars:
@ -61,5 +55,3 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -53,8 +53,6 @@
when: when:
- should_copy_custom_meter_definitions - should_copy_custom_meter_definitions
with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Check if the folder ["{{ node_custom_config }}/ceilometer/{{ ceilometer_dynamic_pollsters_local_folder }}"] for dynamic pollsters definitions exist - name: Check if the folder ["{{ node_custom_config }}/ceilometer/{{ ceilometer_dynamic_pollsters_local_folder }}"] for dynamic pollsters definitions exist
stat: stat:
@ -93,8 +91,6 @@
when: when:
- should_copy_dynamic_pollster_definitions - should_copy_dynamic_pollster_definitions
- inventory_hostname in groups['ceilometer-central'] - inventory_hostname in groups['ceilometer-central']
notify:
- "Restart ceilometer-central container"
- name: Check if custom polling.yaml exists - name: Check if custom polling.yaml exists
stat: stat:
@ -112,8 +108,6 @@
when: when:
- ceilometer_polling_file.stat.exists - ceilometer_polling_file.stat.exists
with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Set ceilometer polling file's path - name: Set ceilometer polling file's path
set_fact: set_fact:
@ -137,8 +131,6 @@
when: when:
- ceilometer_gnocchi_resources_file.stat.exists - ceilometer_gnocchi_resources_file.stat.exists
with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Set ceilometer gnocchi_resources file's path - name: Set ceilometer gnocchi_resources file's path
set_fact: set_fact:
@ -176,8 +168,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over ceilometer.conf - name: Copying over ceilometer.conf
vars: vars:
@ -193,8 +183,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Check custom event_definitions.yaml exists - name: Check custom event_definitions.yaml exists
stat: stat:
@ -215,8 +203,6 @@
when: when:
- ceilometer_event_definitions_file.stat.exists - ceilometer_event_definitions_file.stat.exists
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart ceilometer-notification container
- name: Copying over event_definitions.yaml for notification service - name: Copying over event_definitions.yaml for notification service
vars: vars:
@ -230,8 +216,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- not ceilometer_event_definitions_file.stat.exists - not ceilometer_event_definitions_file.stat.exists
notify:
- Restart ceilometer-notification container
- name: Copying over event_pipeline.yaml - name: Copying over event_pipeline.yaml
vars: vars:
@ -245,8 +229,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart ceilometer-notification container
- name: Check custom pipeline.yaml exists - name: Check custom pipeline.yaml exists
stat: stat:
@ -271,8 +253,6 @@
- ceilometer_pipeline_file.stat.exists - ceilometer_pipeline_file.stat.exists
- item.key in services_require_pipeline - item.key in services_require_pipeline
with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over pipeline.yaml file - name: Copying over pipeline.yaml file
vars: vars:
@ -289,8 +269,6 @@
- item.key in services_require_pipeline - item.key in services_require_pipeline
- not ceilometer_pipeline_file.stat.exists - not ceilometer_pipeline_file.stat.exists
with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying VMware vCenter CA file - name: Copying VMware vCenter CA file
become: true become: true
@ -304,8 +282,6 @@
- nova_compute_virt_type == "vmware" - nova_compute_virt_type == "vmware"
- not vmware_vcenter_insecure | bool - not vmware_vcenter_insecure | bool
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart ceilometer-compute container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -316,5 +292,3 @@
when: when:
- ceilometer_policy_file is defined - ceilometer_policy_file is defined
with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ceilometer_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart cinder-scheduler container - name: Restart cinder-scheduler container
vars: vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart cinder-volume container - name: Restart cinder-volume container
vars: vars:
@ -47,8 +43,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart cinder-backup container - name: Restart cinder-backup container
vars: vars:
@ -64,8 +58,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
# NOTE(mgoddard): After upgrading cinder, services will have an RPC version cap # NOTE(mgoddard): After upgrading cinder, services will have an RPC version cap
# in place. We need to restart all services in order to allow them to use the # in place. We need to restart all services in order to allow them to use the

View File

@ -51,8 +51,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ cinder_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ cinder_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over cinder-wsgi.conf - name: Copying over cinder-wsgi.conf
vars: vars:
@ -67,8 +65,6 @@
- "{{ node_custom_config }}/cinder/cinder-wsgi.conf" - "{{ node_custom_config }}/cinder/cinder-wsgi.conf"
- "cinder-wsgi.conf.j2" - "cinder-wsgi.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart cinder-api container
- name: Copying over cinder.conf - name: Copying over cinder.conf
vars: vars:
@ -84,8 +80,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ cinder_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ cinder_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Generating 'hostnqn' file for cinder_volume - name: Generating 'hostnqn' file for cinder_volume
vars: vars:
@ -97,8 +91,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart cinder-volume container
- name: Copying over existing policy file - name: Copying over existing policy file
become: true become: true
@ -109,8 +101,6 @@
when: when:
- cinder_policy_file is defined - cinder_policy_file is defined
with_dict: "{{ cinder_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ cinder_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over nfs_shares files for cinder_volume - name: Copying over nfs_shares files for cinder_volume
vars: vars:
@ -132,5 +122,3 @@
- "{{ node_custom_config }}/cinder/{{ inventory_hostname }}/nfs_shares" - "{{ node_custom_config }}/cinder/{{ inventory_hostname }}/nfs_shares"
skip: "{{ not enable_cinder_backend_nfs | bool }}" skip: "{{ not enable_cinder_backend_nfs | bool }}"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart cinder-volume container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart cloudkitty-processor container - name: Restart cloudkitty-processor container
vars: vars:
@ -28,5 +26,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -43,8 +43,6 @@
when: when:
- cloudkitty_custom_metrics_file.stat.exists - cloudkitty_custom_metrics_file.stat.exists
with_dict: "{{ cloudkitty_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ cloudkitty_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Are we using {{ cloudkitty_custom_metrics_yaml_file }}? - name: Are we using {{ cloudkitty_custom_metrics_yaml_file }}?
set_fact: set_fact:
@ -61,8 +59,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ cloudkitty_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ cloudkitty_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over cloudkitty.conf - name: Copying over cloudkitty.conf
vars: vars:
@ -78,8 +74,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ cloudkitty_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ cloudkitty_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over wsgi-cloudkitty.conf - name: Copying over wsgi-cloudkitty.conf
vars: vars:
@ -90,8 +84,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart cloudkitty-api container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -102,5 +94,3 @@
when: when:
- cloudkitty_policy_file is defined - cloudkitty_policy_file is defined
with_dict: "{{ cloudkitty_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ cloudkitty_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -12,5 +12,3 @@
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -26,8 +26,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ collectd_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ collectd_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart collectd container
- name: Copying over collectd.conf for services - name: Copying over collectd.conf for services
vars: vars:
@ -43,5 +41,3 @@
- "{{ node_custom_config }}/collectd.conf" - "{{ node_custom_config }}/collectd.conf"
- "collectd.conf.j2" - "collectd.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart collectd container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
environment: "{{ service.environment }}" environment: "{{ service.environment }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart kolla-toolbox container - name: Restart kolla-toolbox container
vars: vars:
@ -29,8 +27,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
environment: "{{ service.environment }}" environment: "{{ service.environment }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
notify: notify:
- Initializing toolbox container using normal user - Initializing toolbox container using normal user
@ -52,5 +48,3 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
environment: "{{ service.environment }}" environment: "{{ service.environment }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -46,8 +46,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ common_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ common_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Find custom fluentd input config files - name: Find custom fluentd input config files
find: find:
@ -147,8 +145,6 @@
become: true become: true
when: when:
- common_services.fluentd | service_enabled_and_mapped_to_host - common_services.fluentd | service_enabled_and_mapped_to_host
notify:
- Restart fluentd container
- name: Copying over cron logrotate config file - name: Copying over cron logrotate config file
vars: vars:
@ -214,8 +210,6 @@
become: true become: true
when: when:
- common_services.cron | service_enabled_and_mapped_to_host - common_services.cron | service_enabled_and_mapped_to_host
notify:
- Restart cron container
- name: Ensure RabbitMQ Erlang cookie exists - name: Ensure RabbitMQ Erlang cookie exists
become: true become: true
@ -226,8 +220,6 @@
when: when:
- common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host - common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
- enable_rabbitmq | bool - enable_rabbitmq | bool
notify:
- Restart kolla-toolbox container
- name: Ensuring config directories have correct owner and permission - name: Ensuring config directories have correct owner and permission
become: true become: true

View File

@ -13,8 +13,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart cyborg-conductor container - name: Restart cyborg-conductor container
vars: vars:
@ -30,8 +28,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart cyborg-agent container - name: Restart cyborg-agent container
vars: vars:
@ -47,5 +43,3 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -37,8 +37,6 @@
when: when:
- cyborg_policy_file is defined - cyborg_policy_file is defined
with_dict: "{{ cyborg_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ cyborg_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:
@ -51,8 +49,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ cyborg_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ cyborg_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over cyborg.conf - name: Copying over cyborg.conf
vars: vars:
@ -68,8 +64,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ cyborg_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ cyborg_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over cyborg-api-paste.ini - name: Copying over cyborg-api-paste.ini
vars: vars:
@ -82,5 +76,3 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart cyborg-api container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart designate-api container - name: Restart designate-api container
vars: vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart designate-central container - name: Restart designate-central container
vars: vars:
@ -44,8 +40,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart designate-producer container - name: Restart designate-producer container
vars: vars:
@ -60,8 +54,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart designate-mdns container - name: Restart designate-mdns container
vars: vars:
@ -76,8 +68,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart designate-worker container - name: Restart designate-worker container
vars: vars:
@ -92,8 +82,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart designate-sink container - name: Restart designate-sink container
vars: vars:
@ -108,5 +96,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -39,8 +39,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over designate.conf - name: Copying over designate.conf
vars: vars:
@ -56,8 +54,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over pools.yaml - name: Copying over pools.yaml
vars: vars:
@ -71,8 +67,6 @@
with_first_found: with_first_found:
- "{{ node_custom_config }}/designate/pools.yaml" - "{{ node_custom_config }}/designate/pools.yaml"
- "{{ role_path }}/templates/pools.yaml.j2" - "{{ role_path }}/templates/pools.yaml.j2"
notify:
- Restart designate-worker container
- name: Copying over named.conf - name: Copying over named.conf
vars: vars:
@ -90,8 +84,6 @@
- "{{ node_custom_config }}/designate/designate-backend-bind9/named.conf" - "{{ node_custom_config }}/designate/designate-backend-bind9/named.conf"
- "{{ node_custom_config }}/designate/named.conf" - "{{ node_custom_config }}/designate/named.conf"
- "{{ role_path }}/templates/named.conf.j2" - "{{ role_path }}/templates/named.conf.j2"
notify:
- Restart designate-backend-bind9 container
- name: Copying over rndc.conf - name: Copying over rndc.conf
template: template:
@ -103,8 +95,6 @@
- designate_backend == 'bind9' and designate_backend_external == 'no' - designate_backend == 'bind9' and designate_backend_external == 'no'
- item.key in [ "designate-backend-bind9", "designate-worker" ] - item.key in [ "designate-backend-bind9", "designate-worker" ]
with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over rndc.key - name: Copying over rndc.key
template: template:
@ -116,8 +106,6 @@
- designate_backend == 'bind9' and designate_backend_external == 'no' - designate_backend == 'bind9' and designate_backend_external == 'no'
- item.key in [ "designate-backend-bind9", "designate-worker" ] - item.key in [ "designate-backend-bind9", "designate-worker" ]
with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- include_tasks: backend_external.yml - include_tasks: backend_external.yml
when: designate_backend_external == 'bind9' when: designate_backend_external == 'bind9'
@ -131,5 +119,3 @@
when: when:
- designate_policy_file is defined - designate_policy_file is defined
with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -8,8 +8,6 @@
- name: Look up the cluster leader - name: Look up the cluster leader
include_tasks: 'lookup_leader.yml' include_tasks: 'lookup_leader.yml'
when:
- kolla_action != "config"
listen: listen:
- Restart etcd container - Restart etcd container
- Bootstrap etcd services - Bootstrap etcd services
@ -42,7 +40,6 @@
when: when:
- inventory_hostname not in (groups.etcd_is_leader_True | default([])) - inventory_hostname not in (groups.etcd_is_leader_True | default([]))
- groups.etcd.index(inventory_hostname) % 4 == item - groups.etcd.index(inventory_hostname) % 4 == item
- kolla_action != "config"
- kolla_action != "upgrade" - kolla_action != "upgrade"
listen: listen:
- Restart etcd container - Restart etcd container
@ -58,7 +55,6 @@
include_tasks: 'restart_services.yml' include_tasks: 'restart_services.yml'
when: when:
- inventory_hostname in (groups.etcd_is_leader_True | default([])) - inventory_hostname in (groups.etcd_is_leader_True | default([]))
- kolla_action != "config"
listen: listen:
- Restart etcd container - Restart etcd container
- Bootstrap etcd services - Bootstrap etcd services

View File

@ -16,8 +16,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ etcd_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ etcd_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:

View File

@ -14,8 +14,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart glance-tls-proxy container - name: Restart glance-tls-proxy container
vars: vars:
@ -30,5 +28,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -55,8 +55,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ glance_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ glance_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over glance-api.conf - name: Copying over glance-api.conf
vars: vars:
@ -72,8 +70,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart glance-api container
- name: Copying over glance-cache.conf for glance_api - name: Copying over glance-cache.conf for glance_api
vars: vars:
@ -90,8 +86,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- enable_glance_image_cache | bool - enable_glance_image_cache | bool
notify:
- Restart glance-api container
- name: Copying over glance-swift.conf for glance_api - name: Copying over glance-swift.conf for glance_api
vars: vars:
@ -108,8 +102,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- glance_backend_swift | bool - glance_backend_swift | bool
notify:
- Restart glance-api container
- name: Copying over glance-image-import.conf - name: Copying over glance-image-import.conf
vars: vars:
@ -122,8 +114,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- glance_enable_interoperable_image_import | bool - glance_enable_interoperable_image_import | bool
notify:
- Restart glance-api container
- name: Copying over property-protections-rules.conf - name: Copying over property-protections-rules.conf
vars: vars:
@ -136,8 +126,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- glance_enable_property_protection | bool - glance_enable_property_protection | bool
notify:
- Restart glance-api container
- name: Copying over existing policy file - name: Copying over existing policy file
vars: vars:
@ -150,8 +138,6 @@
when: when:
- glance_policy_file is defined - glance_policy_file is defined
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart glance-api container
- name: Copying over glance-haproxy-tls.cfg - name: Copying over glance-haproxy-tls.cfg
vars: vars:
@ -166,5 +152,3 @@
- "{{ node_custom_config }}/glance/glance-tls-proxy.cfg" - "{{ node_custom_config }}/glance/glance-tls-proxy.cfg"
- "glance-tls-proxy.cfg.j2" - "glance-tls-proxy.cfg.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart glance-tls-proxy container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart gnocchi-metricd container - name: Restart gnocchi-metricd container
vars: vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart gnocchi-statsd container - name: Restart gnocchi-statsd container
vars: vars:
@ -44,5 +40,3 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -43,8 +43,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ gnocchi_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ gnocchi_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over gnocchi.conf - name: Copying over gnocchi.conf
vars: vars:
@ -60,8 +58,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ gnocchi_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ gnocchi_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over wsgi-gnocchi.conf - name: Copying over wsgi-gnocchi.conf
vars: vars:
@ -74,8 +70,6 @@
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
with_items: with_items:
- "gnocchi-api" - "gnocchi-api"
notify:
- Restart gnocchi-api container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -86,5 +80,3 @@
when: when:
- gnocchi_policy_file is defined - gnocchi_policy_file is defined
with_dict: "{{ gnocchi_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ gnocchi_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -13,7 +13,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when: when:
- kolla_action != "config"
- inventory_hostname == groups[service.group] | first - inventory_hostname == groups[service.group] | first
- name: Waiting for grafana to start on first node - name: Waiting for grafana to start on first node
@ -33,7 +32,6 @@
retries: "{{ grafana_start_first_node_retries }}" retries: "{{ grafana_start_first_node_retries }}"
delay: "{{ grafana_start_first_node_delay }}" delay: "{{ grafana_start_first_node_delay }}"
when: when:
- kolla_action != "config"
- inventory_hostname == groups[service.group] | first - inventory_hostname == groups[service.group] | first
- name: Restart remaining grafana containers - name: Restart remaining grafana containers
@ -50,5 +48,4 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when: when:
- kolla_action != "config"
- inventory_hostname != groups[service.group] | first - inventory_hostname != groups[service.group] | first

View File

@ -31,8 +31,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ grafana_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ grafana_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over grafana.ini - name: Copying over grafana.ini
vars: vars:
@ -46,8 +44,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ grafana_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ grafana_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over extra configuration file - name: Copying over extra configuration file
become: true become: true
@ -59,8 +55,6 @@
- item is defined - item is defined
with_items: with_items:
- "{{ check_extra_conf_grafana.files }}" - "{{ check_extra_conf_grafana.files }}"
notify:
- Restart grafana container
- name: Configuring Prometheus as data source for Grafana - name: Configuring Prometheus as data source for Grafana
vars: vars:
@ -77,8 +71,6 @@
- "{{ node_custom_config }}/grafana/{{ inventory_hostname }}/prometheus.yaml" - "{{ node_custom_config }}/grafana/{{ inventory_hostname }}/prometheus.yaml"
- "{{ node_custom_config }}/grafana/prometheus.yaml" - "{{ node_custom_config }}/grafana/prometheus.yaml"
- "prometheus.yaml.j2" - "prometheus.yaml.j2"
notify:
- Restart grafana container
- name: Configuring dashboards provisioning - name: Configuring dashboards provisioning
vars: vars:
@ -93,8 +85,6 @@
- "{{ node_custom_config }}/grafana/{{ inventory_hostname }}/provisioning.yaml" - "{{ node_custom_config }}/grafana/{{ inventory_hostname }}/provisioning.yaml"
- "{{ node_custom_config }}/grafana/provisioning.yaml" - "{{ node_custom_config }}/grafana/provisioning.yaml"
- "{{ role_path }}/templates/provisioning.yaml.j2" - "{{ role_path }}/templates/provisioning.yaml.j2"
notify:
- Restart grafana container
- name: Check if the folder for custom grafana dashboards exists - name: Check if the folder for custom grafana dashboards exists
stat: stat:
@ -124,5 +114,3 @@
- grafana_custom_dashboards_folder.stat.exists - grafana_custom_dashboards_folder.stat.exists
- grafana_custom_dashboards_folder.stat.isdir - grafana_custom_dashboards_folder.stat.isdir
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart grafana container

View File

@ -13,8 +13,6 @@
ipc_mode: "{{ service.ipc_mode }}" ipc_mode: "{{ service.ipc_mode }}"
cap_add: "{{ service.cap_add }}" cap_add: "{{ service.cap_add }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart hacluster-pacemaker container - name: Restart hacluster-pacemaker container
vars: vars:
@ -30,8 +28,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
ipc_mode: "{{ service.ipc_mode }}" ipc_mode: "{{ service.ipc_mode }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart hacluster-pacemaker-remote container - name: Restart hacluster-pacemaker-remote container
vars: vars:
@ -46,5 +42,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
ipc_mode: "{{ service.ipc_mode }}" ipc_mode: "{{ service.ipc_mode }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -17,8 +17,6 @@
mode: "0660" mode: "0660"
register: config_jsons register: config_jsons
with_dict: "{{ hacluster_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ hacluster_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over corosync.conf into hacluster-corosync - name: Copying over corosync.conf into hacluster-corosync
vars: vars:
@ -33,8 +31,6 @@
- "{{ node_custom_config }}/hacluster-corosync/{{ inventory_hostname }}/corosync.conf" - "{{ node_custom_config }}/hacluster-corosync/{{ inventory_hostname }}/corosync.conf"
- "{{ node_custom_config }}/hacluster-corosync/corosync.conf" - "{{ node_custom_config }}/hacluster-corosync/corosync.conf"
- "hacluster_corosync.conf.j2" - "hacluster_corosync.conf.j2"
notify:
- Restart hacluster-corosync container
- name: Copying over Corosync authkey file - name: Copying over Corosync authkey file
vars: vars:
@ -48,8 +44,6 @@
with_first_found: with_first_found:
- "{{ node_custom_config }}/hacluster-corosync/{{ inventory_hostname }}/authkey" - "{{ node_custom_config }}/hacluster-corosync/{{ inventory_hostname }}/authkey"
- "{{ node_custom_config }}/hacluster-corosync/authkey" - "{{ node_custom_config }}/hacluster-corosync/authkey"
notify:
- Restart hacluster-corosync container
- name: Copying over Pacemaker authkey file - name: Copying over Pacemaker authkey file
vars: vars:
@ -63,8 +57,6 @@
with_first_found: with_first_found:
- "{{ node_custom_config }}/hacluster-pacemaker/{{ inventory_hostname }}/authkey" - "{{ node_custom_config }}/hacluster-pacemaker/{{ inventory_hostname }}/authkey"
- "{{ node_custom_config }}/hacluster-pacemaker/authkey" - "{{ node_custom_config }}/hacluster-pacemaker/authkey"
notify:
- Restart hacluster-pacemaker container
- name: Copying over Pacemaker authkey file into hacluster-pacemaker-remote - name: Copying over Pacemaker authkey file into hacluster-pacemaker-remote
vars: vars:
@ -78,5 +70,3 @@
with_first_found: with_first_found:
- "{{ node_custom_config }}/hacluster-pacemaker/{{ inventory_hostname }}/authkey" - "{{ node_custom_config }}/hacluster-pacemaker/{{ inventory_hostname }}/authkey"
- "{{ node_custom_config }}/hacluster-pacemaker/authkey" - "{{ node_custom_config }}/hacluster-pacemaker/authkey"
notify:
- Restart hacluster-pacemaker-remote container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart heat-api-cfn container - name: Restart heat-api-cfn container
vars: vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart heat-engine container - name: Restart heat-engine container
vars: vars:
@ -44,5 +40,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -39,8 +39,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/config.json" dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660" mode: "0660"
with_dict: "{{ heat_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ heat_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over heat.conf - name: Copying over heat.conf
become: true become: true
@ -56,8 +54,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/heat.conf" dest: "{{ node_config_directory }}/{{ item.key }}/heat.conf"
mode: "0660" mode: "0660"
with_dict: "{{ heat_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ heat_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over existing policy file - name: Copying over existing policy file
become: true become: true
@ -68,8 +64,6 @@
when: when:
- heat_policy_file is defined - heat_policy_file is defined
with_dict: "{{ heat_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ heat_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over heat-api wsgi config - name: Copying over heat-api wsgi config
vars: vars:
@ -80,8 +74,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart heat-api container
- name: Copying over heat-api-cfn wsgi config - name: Copying over heat-api-cfn wsgi config
vars: vars:
@ -92,5 +84,3 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart heat-api-cfn container

View File

@ -13,5 +13,3 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -46,8 +46,6 @@
dest: "{{ node_config_directory }}/horizon/config.json" dest: "{{ node_config_directory }}/horizon/config.json"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart horizon container
- name: Copying over horizon.conf - name: Copying over horizon.conf
become: true become: true
@ -62,8 +60,6 @@
- "{{ node_custom_config }}/horizon/horizon.conf" - "{{ node_custom_config }}/horizon/horizon.conf"
- "horizon.conf.j2" - "horizon.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart horizon container
- name: Copying over kolla-settings.py - name: Copying over kolla-settings.py
become: true become: true
@ -78,8 +74,6 @@
- "{{ node_custom_config }}/horizon/_9998-kolla-settings.py" - "{{ node_custom_config }}/horizon/_9998-kolla-settings.py"
- "_9998-kolla-settings.py.j2" - "_9998-kolla-settings.py.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart horizon container
- name: Copying over custom-settings.py - name: Copying over custom-settings.py
become: true become: true
@ -94,8 +88,6 @@
- "{{ node_custom_config }}/horizon/_9999-custom-settings.py" - "{{ node_custom_config }}/horizon/_9999-custom-settings.py"
- "_9999-custom-settings.py.j2" - "_9999-custom-settings.py.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart horizon container
- name: Copying over existing policy file - name: Copying over existing policy file
become: true become: true
@ -107,8 +99,6 @@
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
with_items: "{{ custom_policy }}" with_items: "{{ custom_policy }}"
notify:
- Restart horizon container
- name: Copying over custom themes - name: Copying over custom themes
become: true become: true
@ -122,8 +112,6 @@
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- horizon_custom_themes | length > 0 - horizon_custom_themes | length > 0
with_items: "{{ horizon_custom_themes }}" with_items: "{{ horizon_custom_themes }}"
notify:
- Restart horizon container
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:

View File

@ -11,5 +11,3 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -16,8 +16,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ influxdb_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ influxdb_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart influxdb container
- name: Copying over influxdb config file - name: Copying over influxdb config file
vars: vars:
@ -32,5 +30,3 @@
- "{{ node_custom_config }}/influxdb/{{ inventory_hostname }}/influxdb.conf" - "{{ node_custom_config }}/influxdb/{{ inventory_hostname }}/influxdb.conf"
- "{{ node_custom_config }}/influxdb.conf" - "{{ node_custom_config }}/influxdb.conf"
- "influxdb.conf.j2" - "influxdb.conf.j2"
notify:
- Restart influxdb container

View File

@ -13,8 +13,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart ironic-api container - name: Restart ironic-api container
vars: vars:
@ -29,8 +27,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart ironic-inspector container - name: Restart ironic-inspector container
vars: vars:
@ -46,8 +42,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart ironic-tftp container - name: Restart ironic-tftp container
vars: vars:
@ -62,8 +56,6 @@
environment: "{{ service.environment }}" environment: "{{ service.environment }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart ironic-http container - name: Restart ironic-http container
vars: vars:
@ -78,8 +70,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart ironic-dnsmasq container - name: Restart ironic-dnsmasq container
vars: vars:
@ -94,8 +84,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
cap_add: "{{ service.cap_add }}" cap_add: "{{ service.cap_add }}"
when:
- kolla_action != "config"
- name: Restart ironic-prometheus-exporter container - name: Restart ironic-prometheus-exporter container
vars: vars:
@ -109,5 +97,3 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -61,6 +61,8 @@
- ironic_inspector_known_devices.stat.exists - ironic_inspector_known_devices.stat.exists
- name: Copying over known_devices.yaml - name: Copying over known_devices.yaml
vars:
service: "{{ ironic_services['ironic-inspector'] }}"
template: template:
src: "{{ ironic_inspector_known_devices_file_path }}" src: "{{ ironic_inspector_known_devices_file_path }}"
dest: "{{ node_config_directory }}/ironic-inspector/known_devices.yaml" dest: "{{ node_config_directory }}/ironic-inspector/known_devices.yaml"
@ -68,10 +70,7 @@
become: true become: true
when: when:
- ironic_inspector_known_devices_file_path is defined - ironic_inspector_known_devices_file_path is defined
- inventory_hostname in groups["ironic-inspector"] - service | service_enabled_and_mapped_to_host
- ironic_services["ironic-inspector"].enabled | bool
notify:
- "Restart ironic-inspector container"
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:
@ -84,8 +83,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ ironic_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ironic_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over ironic.conf - name: Copying over ironic.conf
vars: vars:
@ -103,8 +100,6 @@
when: when:
- item.key in [ "ironic-api", "ironic-conductor", "ironic-prometheus-exporter" ] - item.key in [ "ironic-api", "ironic-conductor", "ironic-prometheus-exporter" ]
with_dict: "{{ ironic_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ironic_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over inspector.conf - name: Copying over inspector.conf
vars: vars:
@ -120,8 +115,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart ironic-inspector container
- name: Copying over dnsmasq.conf - name: Copying over dnsmasq.conf
vars: vars:
@ -136,8 +129,6 @@
- "{{ node_custom_config }}/ironic/ironic-dnsmasq.conf" - "{{ node_custom_config }}/ironic/ironic-dnsmasq.conf"
- "{{ node_custom_config }}/ironic/{{ inventory_hostname }}/ironic-dnsmasq.conf" - "{{ node_custom_config }}/ironic/{{ inventory_hostname }}/ironic-dnsmasq.conf"
- "ironic-dnsmasq.conf.j2" - "ironic-dnsmasq.conf.j2"
notify:
- Restart ironic-dnsmasq container
- name: Copying pxelinux.cfg default - name: Copying pxelinux.cfg default
vars: vars:
@ -156,8 +147,6 @@
- groups['ironic-inspector'] | length > 0 - groups['ironic-inspector'] | length > 0
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- not ironic_dnsmasq_serve_ipxe | bool - not ironic_dnsmasq_serve_ipxe | bool
notify:
- Restart ironic-tftp container
- name: Copying ironic-agent kernel and initramfs (PXE) - name: Copying ironic-agent kernel and initramfs (PXE)
vars: vars:
@ -175,8 +164,6 @@
- groups['ironic-inspector'] | length > 0 - groups['ironic-inspector'] | length > 0
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- not ironic_dnsmasq_serve_ipxe | bool - not ironic_dnsmasq_serve_ipxe | bool
notify:
- Restart ironic-tftp container
- name: Copying ironic-agent kernel and initramfs (iPXE) - name: Copying ironic-agent kernel and initramfs (iPXE)
vars: vars:
@ -193,8 +180,6 @@
# Only required when Ironic inspector is in use. # Only required when Ironic inspector is in use.
- groups['ironic-inspector'] | length > 0 - groups['ironic-inspector'] | length > 0
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart ironic-http container
- name: Copying inspector.ipxe - name: Copying inspector.ipxe
vars: vars:
@ -212,8 +197,6 @@
# Only required when Ironic inspector is in use. # Only required when Ironic inspector is in use.
- groups['ironic-inspector'] | length > 0 - groups['ironic-inspector'] | length > 0
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart ironic-http container
- name: Copying ironic-http-httpd.conf - name: Copying ironic-http-httpd.conf
vars: vars:
@ -227,8 +210,6 @@
- "{{ node_custom_config }}/ironic/ironic-http-httpd.conf" - "{{ node_custom_config }}/ironic/ironic-http-httpd.conf"
- "ironic-http-httpd.conf.j2" - "ironic-http-httpd.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart ironic-http container
- name: Copying over ironic-prometheus-exporter-wsgi.conf - name: Copying over ironic-prometheus-exporter-wsgi.conf
vars: vars:
@ -243,8 +224,6 @@
- "{{ node_config_directory }}/ironic/ironic-prometheus-exporter-wsgi.conf" - "{{ node_config_directory }}/ironic/ironic-prometheus-exporter-wsgi.conf"
- "ironic-prometheus-exporter-wsgi.conf.j2" - "ironic-prometheus-exporter-wsgi.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart ironic-prometheus-exporter container"
- name: Copying over existing Ironic policy file - name: Copying over existing Ironic policy file
vars: vars:
@ -260,8 +239,6 @@
- ironic_policy_file is defined - ironic_policy_file is defined
- item.key in services_require_policy_json - item.key in services_require_policy_json
with_dict: "{{ ironic_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ironic_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over existing Ironic Inspector policy file - name: Copying over existing Ironic Inspector policy file
vars: vars:
@ -276,8 +253,6 @@
- ironic_inspector_policy_file is defined - ironic_inspector_policy_file is defined
- item.key in services_require_inspector_policy_json - item.key in services_require_inspector_policy_json
with_dict: "{{ ironic_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ironic_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over ironic-api-wsgi.conf - name: Copying over ironic-api-wsgi.conf
vars: vars:
@ -288,5 +263,3 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart ironic-api container"

View File

@ -13,8 +13,6 @@
privileged: "{{ service.privileged }}" privileged: "{{ service.privileged }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart tgtd container - name: Restart tgtd container
vars: vars:
@ -30,5 +28,3 @@
privileged: "{{ service.privileged }}" privileged: "{{ service.privileged }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -16,5 +16,3 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ iscsi_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ iscsi_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"

View File

@ -39,8 +39,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart keystone-fernet container - name: Restart keystone-fernet container
vars: vars:
@ -55,8 +53,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart keystone container - name: Restart keystone container
vars: vars:
@ -71,8 +67,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Finish keystone database upgrade - name: Finish keystone database upgrade
vars: vars:

View File

@ -46,8 +46,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ keystone_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ keystone_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over keystone.conf - name: Copying over keystone.conf
vars: vars:
@ -65,8 +63,6 @@
with_dict: "{{ keystone_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ keystone_services | select_services_enabled_and_mapped_to_host }}"
when: when:
- item.key in [ "keystone", "keystone-fernet" ] - item.key in [ "keystone", "keystone-fernet" ]
notify:
- Restart {{ item.key }} container
- name: Copying keystone-startup script for keystone - name: Copying keystone-startup script for keystone
vars: vars:
@ -77,8 +73,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart keystone container
- name: Create Keystone domain-specific config directory - name: Create Keystone domain-specific config directory
vars: vars:
@ -114,8 +108,6 @@
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- keystone_domain_directory.stat.exists - keystone_domain_directory.stat.exists
with_items: "{{ keystone_domains.files | default([]) }}" with_items: "{{ keystone_domains.files | default([]) }}"
notify:
- Restart keystone container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -127,8 +119,6 @@
- item.key in [ "keystone", "keystone-fernet" ] - item.key in [ "keystone", "keystone-fernet" ]
- keystone_policy_file is defined - keystone_policy_file is defined
with_dict: "{{ keystone_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ keystone_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- include_tasks: config-federation-oidc.yml - include_tasks: config-federation-oidc.yml
when: when:
@ -147,8 +137,6 @@
- "{{ node_custom_config }}/keystone/{{ inventory_hostname }}/wsgi-keystone.conf" - "{{ node_custom_config }}/keystone/{{ inventory_hostname }}/wsgi-keystone.conf"
- "{{ node_custom_config }}/keystone/wsgi-keystone.conf" - "{{ node_custom_config }}/keystone/wsgi-keystone.conf"
- "wsgi-keystone.conf.j2" - "wsgi-keystone.conf.j2"
notify:
- Restart keystone container
- name: Checking whether keystone-paste.ini file exists - name: Checking whether keystone-paste.ini file exists
vars: vars:
@ -171,8 +159,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- check_keystone_paste_ini.stat.exists - check_keystone_paste_ini.stat.exists
notify:
- Restart keystone container
- name: Generate the required cron jobs for the node - name: Generate the required cron jobs for the node
command: > command: >
@ -209,8 +195,6 @@
- { src: "id_rsa", dest: "id_rsa" } - { src: "id_rsa", dest: "id_rsa" }
- { src: "ssh_config.j2", dest: "ssh_config" } - { src: "ssh_config.j2", dest: "ssh_config" }
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart keystone-fernet container
- name: Copying files for keystone-ssh - name: Copying files for keystone-ssh
vars: vars:
@ -224,5 +208,3 @@
- { src: "sshd_config.j2", dest: "sshd_config" } - { src: "sshd_config.j2", dest: "sshd_config" }
- { src: "id_rsa.pub", dest: "id_rsa.pub" } - { src: "id_rsa.pub", dest: "id_rsa.pub" }
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart keystone-ssh container

View File

@ -14,5 +14,3 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -39,8 +39,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ kuryr_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ kuryr_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart kuryr container
- name: Copying over kuryr.conf - name: Copying over kuryr.conf
vars: vars:
@ -56,8 +54,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ kuryr_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ kuryr_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart kuryr container
- name: Copying over kuryr.spec - name: Copying over kuryr.spec
vars: vars:
@ -70,8 +66,6 @@
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
with_items: with_items:
- "kuryr" - "kuryr"
notify:
- Restart kuryr container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -82,5 +76,3 @@
when: when:
- kuryr_policy_file is defined - kuryr_policy_file is defined
with_dict: "{{ kuryr_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ kuryr_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart kuryr container

View File

@ -13,8 +13,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
environment: "{{ service.environment | default(omit) }}" environment: "{{ service.environment | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart letsencrypt-lego container - name: Restart letsencrypt-lego container
vars: vars:
@ -30,5 +28,3 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
environment: "{{ service.environment | default(omit) }}" environment: "{{ service.environment | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -16,8 +16,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ letsencrypt_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ letsencrypt_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over letsencrypt-webserver.conf - name: Copying over letsencrypt-webserver.conf
vars: vars:
@ -32,8 +30,6 @@
- "{{ node_custom_config }}/letsencrypt/letsencrypt-webserver.conf" - "{{ node_custom_config }}/letsencrypt/letsencrypt-webserver.conf"
- "letsencrypt-webserver.conf.j2" - "letsencrypt-webserver.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart letsencrypt-webserver container
- name: Copying files for letsencrypt-lego - name: Copying files for letsencrypt-lego
vars: vars:
@ -48,8 +44,6 @@
- { src: "id_rsa.j2", dest: "id_rsa" } - { src: "id_rsa.j2", dest: "id_rsa" }
- { src: "letsencrypt-lego-run.sh.j2", dest: "letsencrypt-lego-run.sh" } - { src: "letsencrypt-lego-run.sh.j2", dest: "letsencrypt-lego-run.sh" }
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart letsencrypt-lego container
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:

View File

@ -58,8 +58,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- loadbalancer_services.proxysql.enabled | bool - loadbalancer_services.proxysql.enabled | bool
notify:
- Restart haproxy container
- name: Removing checks for services which are disabled - name: Removing checks for services which are disabled
vars: vars:
@ -76,8 +74,6 @@
- not item.value.enabled | bool - not item.value.enabled | bool
or not inventory_hostname in groups[item.value.group] or not inventory_hostname in groups[item.value.group]
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart keepalived container
- name: Copying checks for services which are enabled - name: Copying checks for services which are enabled
vars: vars:
@ -95,8 +91,6 @@
- item.key != 'haproxy-ssh' - item.key != 'haproxy-ssh'
- item.value.enabled | bool - item.value.enabled | bool
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart keepalived container
- name: Copying over config.json files for services - name: Copying over config.json files for services
template: template:
@ -105,8 +99,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ loadbalancer_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ loadbalancer_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over haproxy.cfg - name: Copying over haproxy.cfg
vars: vars:
@ -121,8 +113,6 @@
- "{{ node_custom_config }}/haproxy/{{ inventory_hostname }}/haproxy_main.cfg" - "{{ node_custom_config }}/haproxy/{{ inventory_hostname }}/haproxy_main.cfg"
- "{{ node_custom_config }}/haproxy/haproxy_main.cfg" - "{{ node_custom_config }}/haproxy/haproxy_main.cfg"
- "haproxy/haproxy_main.cfg.j2" - "haproxy/haproxy_main.cfg.j2"
notify:
- Restart haproxy container
- name: Copying over proxysql config - name: Copying over proxysql config
vars: vars:
@ -137,8 +127,6 @@
- "{{ node_custom_config }}/proxysql/{{ inventory_hostname }}/proxysql.yaml" - "{{ node_custom_config }}/proxysql/{{ inventory_hostname }}/proxysql.yaml"
- "{{ node_custom_config }}/proxysql/proxysql.yaml" - "{{ node_custom_config }}/proxysql/proxysql.yaml"
- "proxysql/proxysql.yaml.j2" - "proxysql/proxysql.yaml.j2"
notify:
- Restart proxysql container
- name: Copying over haproxy single external frontend config - name: Copying over haproxy single external frontend config
vars: vars:
@ -151,8 +139,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- haproxy_single_external_frontend | bool - haproxy_single_external_frontend | bool
notify:
- Restart haproxy container
- name: Copying over custom haproxy services configuration - name: Copying over custom haproxy services configuration
vars: vars:
@ -165,8 +151,6 @@
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
with_fileglob: with_fileglob:
- "{{ node_custom_config }}/haproxy/services.d/*.cfg" - "{{ node_custom_config }}/haproxy/services.d/*.cfg"
notify:
- Restart haproxy container
- name: Copying over keepalived.conf - name: Copying over keepalived.conf
vars: vars:
@ -181,8 +165,6 @@
- "{{ node_custom_config }}/keepalived/{{ inventory_hostname }}/keepalived.conf" - "{{ node_custom_config }}/keepalived/{{ inventory_hostname }}/keepalived.conf"
- "{{ node_custom_config }}/keepalived/keepalived.conf" - "{{ node_custom_config }}/keepalived/keepalived.conf"
- "keepalived/keepalived.conf.j2" - "keepalived/keepalived.conf.j2"
notify:
- Restart keepalived container
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:
@ -201,8 +183,6 @@
- "{{ node_custom_config }}/haproxy/{{ inventory_hostname }}/haproxy_run.sh" - "{{ node_custom_config }}/haproxy/{{ inventory_hostname }}/haproxy_run.sh"
- "{{ node_custom_config }}/haproxy/haproxy_run.sh" - "{{ node_custom_config }}/haproxy/haproxy_run.sh"
- "haproxy/haproxy_run.sh.j2" - "haproxy/haproxy_run.sh.j2"
notify:
- Restart haproxy container
- name: Copying over proxysql start script - name: Copying over proxysql start script
vars: vars:
@ -217,8 +197,6 @@
- "{{ node_custom_config }}/proxysql/{{ inventory_hostname }}/proxysql_run.sh" - "{{ node_custom_config }}/proxysql/{{ inventory_hostname }}/proxysql_run.sh"
- "{{ node_custom_config }}/proxysql/proxysql_run.sh" - "{{ node_custom_config }}/proxysql/proxysql_run.sh"
- "proxysql/proxysql_run.sh.j2" - "proxysql/proxysql_run.sh.j2"
notify:
- Restart proxysql container
- name: Copying files for haproxy-ssh - name: Copying files for haproxy-ssh
vars: vars:
@ -232,5 +210,3 @@
- { src: "haproxy-ssh/sshd_config.j2", dest: "sshd_config" } - { src: "haproxy-ssh/sshd_config.j2", dest: "sshd_config" }
- { src: "haproxy-ssh/id_rsa.pub", dest: "id_rsa.pub" } - { src: "haproxy-ssh/id_rsa.pub", dest: "id_rsa.pub" }
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart haproxy-ssh container

View File

@ -14,8 +14,6 @@
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
with_items: with_items:
- "haproxy.pem" - "haproxy.pem"
notify:
- Restart haproxy container
- name: Copying over haproxy-internal.pem - name: Copying over haproxy-internal.pem
vars: vars:
@ -32,8 +30,6 @@
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
with_items: with_items:
- "haproxy-internal.pem" - "haproxy-internal.pem"
notify:
- Restart haproxy container
- name: Copying over proxysql-cert.pem - name: Copying over proxysql-cert.pem
vars: vars:
@ -46,8 +42,6 @@
when: when:
- database_enable_tls_internal | bool - database_enable_tls_internal | bool
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart proxysql container
- name: Copying over proxysql-key.pem - name: Copying over proxysql-key.pem
vars: vars:
@ -60,8 +54,6 @@
when: when:
- database_enable_tls_internal | bool - database_enable_tls_internal | bool
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart proxysql container
- name: "Copy certificates and keys for {{ project_name }}" - name: "Copy certificates and keys for {{ project_name }}"
import_role: import_role:

View File

@ -13,8 +13,6 @@
environment: "{{ service.environment }}" environment: "{{ service.environment }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart magnum-conductor container - name: Restart magnum-conductor container
vars: vars:
@ -30,5 +28,3 @@
environment: "{{ service.environment }}" environment: "{{ service.environment }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -44,8 +44,6 @@
when: when:
- magnum_kubeconfig_file.stat.exists - magnum_kubeconfig_file.stat.exists
with_dict: "{{ magnum_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ magnum_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Set magnum kubeconfig file's path - name: Set magnum kubeconfig file's path
set_fact: set_fact:
@ -64,8 +62,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ magnum_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ magnum_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over magnum.conf - name: Copying over magnum.conf
vars: vars:
@ -81,8 +77,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ magnum_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ magnum_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -93,5 +87,3 @@
when: when:
- magnum_policy_file is defined - magnum_policy_file is defined
with_dict: "{{ magnum_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ magnum_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart manila-data container - name: Restart manila-data container
vars: vars:
@ -29,8 +27,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart manila-scheduler container - name: Restart manila-scheduler container
vars: vars:
@ -45,8 +41,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart manila-share container - name: Restart manila-share container
vars: vars:
@ -63,5 +57,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -44,8 +44,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ manila_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ manila_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over manila.conf - name: Copying over manila.conf
vars: vars:
@ -63,8 +61,6 @@
when: when:
- item.key in [ "manila-api", "manila-data", "manila-scheduler" ] - item.key in [ "manila-api", "manila-data", "manila-scheduler" ]
with_dict: "{{ manila_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ manila_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over manila-share.conf - name: Copying over manila-share.conf
vars: vars:
@ -85,8 +81,6 @@
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
with_items: with_items:
- "manila-share" - "manila-share"
notify:
- Restart manila-share container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -96,5 +90,3 @@
when: when:
- manila_policy_file is defined - manila_policy_file is defined
with_dict: "{{ manila_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ manila_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"

View File

@ -59,7 +59,6 @@
when: when:
- groups[mariadb_shard_group + '_port_alive_True'] is defined - groups[mariadb_shard_group + '_port_alive_True'] is defined
- inventory_hostname in groups[mariadb_shard_group + '_port_alive_True'] - inventory_hostname in groups[mariadb_shard_group + '_port_alive_True']
- kolla_action != "config"
listen: Restart mariadb container listen: Restart mariadb container
- name: Start MariaDB on new nodes - name: Start MariaDB on new nodes
@ -69,7 +68,6 @@
- bootstrap_host is not defined or bootstrap_host != inventory_hostname - bootstrap_host is not defined or bootstrap_host != inventory_hostname
- groups[mariadb_shard_group + '_port_alive_False'] is defined - groups[mariadb_shard_group + '_port_alive_False'] is defined
- inventory_hostname in groups[mariadb_shard_group + '_port_alive_False'] - inventory_hostname in groups[mariadb_shard_group + '_port_alive_False']
- kolla_action != "config"
listen: Restart mariadb container listen: Restart mariadb container
- name: Restart mariadb-clustercheck container - name: Restart mariadb-clustercheck container
@ -88,5 +86,4 @@
listen: listen:
- Restart mariadb-clustercheck container - Restart mariadb-clustercheck container
when: when:
- kolla_action != "config"
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host

View File

@ -43,8 +43,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ mariadb_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ mariadb_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over config.json files for mariabackup - name: Copying over config.json files for mariabackup
vars: vars:
@ -71,7 +69,5 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart mariadb container
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml

View File

@ -12,8 +12,6 @@
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart masakari-engine container - name: Restart masakari-engine container
vars: vars:
@ -28,8 +26,6 @@
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart masakari-instancemonitor container - name: Restart masakari-instancemonitor container
vars: vars:
@ -44,8 +40,6 @@
privileged: "{{ service.privileged | default(True) }}" privileged: "{{ service.privileged | default(True) }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart masakari-hostmonitor container - name: Restart masakari-hostmonitor container
vars: vars:
@ -60,5 +54,3 @@
ipc_mode: "{{ service.ipc_mode }}" ipc_mode: "{{ service.ipc_mode }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -37,8 +37,6 @@
when: when:
- masakari_policy_file is defined - masakari_policy_file is defined
with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over config.json files for services - name: Copying over config.json files for services
template: template:
@ -47,8 +45,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:
@ -72,8 +68,6 @@
with_items: with_items:
- masakari-api - masakari-api
- masakari-engine - masakari-engine
notify:
- Restart {{ service_name }} container
- name: Copying over masakari-monitors.conf - name: Copying over masakari-monitors.conf
vars: vars:
@ -93,8 +87,6 @@
with_items: with_items:
- masakari-instancemonitor - masakari-instancemonitor
- masakari-hostmonitor - masakari-hostmonitor
notify:
- Restart {{ service_name }} container
- name: Copying over wsgi-masakari file for services - name: Copying over wsgi-masakari file for services
vars: vars:
@ -105,8 +97,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart masakari-api container
- name: Copying over masakari-api-paste.ini - name: Copying over masakari-api-paste.ini
vars: vars:
@ -119,8 +109,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart masakari-api container
- name: Copying over libvirt SASL configuration - name: Copying over libvirt SASL configuration
become: true become: true
@ -136,5 +124,3 @@
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
with_items: with_items:
- { src: "auth.conf.j2", dest: "auth.conf", service: "masakari-instancemonitor" } - { src: "auth.conf.j2", dest: "auth.conf", service: "masakari-instancemonitor" }
notify:
- Restart {{ service_name }} container

View File

@ -11,5 +11,3 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -21,4 +21,3 @@
with_items: with_items:
- "memcached" - "memcached"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify: Restart memcached container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart mistral-engine container - name: Restart mistral-engine container
vars: vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart mistral-event-engine container - name: Restart mistral-event-engine container
vars: vars:
@ -44,8 +40,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart mistral-executor container - name: Restart mistral-executor container
vars: vars:
@ -60,5 +54,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -39,8 +39,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ mistral_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ mistral_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over mistral.conf - name: Copying over mistral.conf
vars: vars:
@ -56,8 +54,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ mistral_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ mistral_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -68,8 +64,6 @@
when: when:
- mistral_policy_file is defined - mistral_policy_file is defined
with_dict: "{{ mistral_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ mistral_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over event_definitions.yaml - name: Copying over event_definitions.yaml
become: true become: true
@ -84,5 +78,3 @@
- "{{ node_custom_config }}/mistral/{{ inventory_hostname }}/event_definitions.yaml" - "{{ node_custom_config }}/mistral/{{ inventory_hostname }}/event_definitions.yaml"
- "{{ node_custom_config }}/mistral/event_definitions.yaml" - "{{ node_custom_config }}/mistral/event_definitions.yaml"
- "{{ role_path }}/templates/event_definitions.yaml.j2" - "{{ role_path }}/templates/event_definitions.yaml.j2"
notify:
- "Restart mistral-event-engine container"

View File

@ -12,5 +12,3 @@
ipc_mode: "{{ service.ipc_mode }}" ipc_mode: "{{ service.ipc_mode }}"
privileged: "{{ service.privileged }}" privileged: "{{ service.privileged }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
when:
- kolla_action != "config"

View File

@ -16,8 +16,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ multipathd_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ multipathd_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart multipathd container
- name: Copying over multipath.conf - name: Copying over multipath.conf
vars: vars:
@ -32,5 +30,3 @@
- "{{ node_custom_config }}/multipath.conf" - "{{ node_custom_config }}/multipath.conf"
- "multipath.conf.j2" - "multipath.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart multipathd container

View File

@ -13,8 +13,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart neutron-openvswitch-agent container - name: Restart neutron-openvswitch-agent container
vars: vars:
@ -31,8 +29,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart fake neutron-openvswitch-agent container - name: Restart fake neutron-openvswitch-agent container
vars: vars:
@ -49,8 +45,6 @@
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
with_sequence: "start=1 end={{ num_nova_fake_per_node }}" with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
when:
- kolla_action != "config"
- name: Restart neutron-linuxbridge-agent container - name: Restart neutron-linuxbridge-agent container
vars: vars:
@ -67,8 +61,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart neutron-dhcp-agent container - name: Restart neutron-dhcp-agent container
vars: vars:
@ -84,8 +76,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Get container facts - name: Get container facts
become: true become: true
@ -95,8 +85,6 @@
name: name:
- neutron_l3_agent - neutron_l3_agent
register: container_facts register: container_facts
when:
- kolla_action != "config"
listen: Restart neutron-l3-agent container listen: Restart neutron-l3-agent container
- name: Group hosts - name: Group hosts
@ -120,7 +108,6 @@
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config"
- groups['neutron_l3_agent_running_False'] is defined - groups['neutron_l3_agent_running_False'] is defined
- inventory_hostname in groups['neutron_l3_agent_running_False'] - inventory_hostname in groups['neutron_l3_agent_running_False']
listen: Restart neutron-l3-agent container listen: Restart neutron-l3-agent container
@ -131,7 +118,6 @@
when: when:
- groups['neutron_l3_agent_running_False'] is defined - groups['neutron_l3_agent_running_False'] is defined
- groups['neutron_l3_agent_running_True'] is defined - groups['neutron_l3_agent_running_True'] is defined
- kolla_action != "config"
listen: Restart neutron-l3-agent container listen: Restart neutron-l3-agent container
- name: Restart running neutron-l3-agent container - name: Restart running neutron-l3-agent container
@ -150,7 +136,6 @@
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config"
- inventory_hostname == item - inventory_hostname == item
loop: "{{ groups['neutron_l3_agent_running_True'] | default([]) }}" loop: "{{ groups['neutron_l3_agent_running_True'] | default([]) }}"
loop_control: loop_control:
@ -171,8 +156,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart neutron-mlnx-agent container - name: Restart neutron-mlnx-agent container
vars: vars:
@ -187,8 +170,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
- name: Restart neutron-eswitchd container - name: Restart neutron-eswitchd container
vars: vars:
@ -203,8 +184,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
- name: Restart neutron-tls-proxy container - name: Restart neutron-tls-proxy container
vars: vars:
@ -219,8 +198,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart neutron-metadata-agent container - name: Restart neutron-metadata-agent container
vars: vars:
@ -236,8 +213,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart neutron-ovn-metadata-agent container - name: Restart neutron-ovn-metadata-agent container
vars: vars:
@ -253,8 +228,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart neutron-bgp-dragent container - name: Restart neutron-bgp-dragent container
vars: vars:
@ -270,8 +243,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart neutron-infoblox-ipam-agent container - name: Restart neutron-infoblox-ipam-agent container
vars: vars:
@ -287,8 +258,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart neutron-metering-agent container - name: Restart neutron-metering-agent container
vars: vars:
@ -304,8 +273,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart ironic-neutron-agent container - name: Restart ironic-neutron-agent container
vars: vars:
@ -321,8 +288,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart neutron-ovn-agent container - name: Restart neutron-ovn-agent container
vars: vars:
@ -338,5 +303,3 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -61,8 +61,6 @@
when: when:
- neutron_policy_file is defined - neutron_policy_file is defined
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over config.json files for services - name: Copying over config.json files for services
become: true become: true
@ -71,8 +69,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/config.json" dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660" mode: "0660"
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over neutron.conf - name: Copying over neutron.conf
become: true become: true
@ -106,8 +102,6 @@
when: when:
- item.key in services_need_neutron_conf - item.key in services_need_neutron_conf
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over neutron_vpnaas.conf - name: Copying over neutron_vpnaas.conf
become: true become: true
@ -126,8 +120,6 @@
when: when:
- item.key in services_need_neutron_vpnaas_conf - item.key in services_need_neutron_vpnaas_conf
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over ssh key - name: Copying over ssh key
become: true become: true
@ -156,8 +148,6 @@
when: when:
- item.key in services_need_ml2_conf_ini - item.key in services_need_ml2_conf_ini
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over linuxbridge_agent.ini - name: Copying over linuxbridge_agent.ini
become: true become: true
@ -172,8 +162,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/linuxbridge_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/linuxbridge_agent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over openvswitch_agent.ini - name: Copying over openvswitch_agent.ini
become: true become: true
@ -188,8 +176,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/openvswitch_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/openvswitch_agent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over sriov_agent.ini - name: Copying over sriov_agent.ini
become: true become: true
@ -204,8 +190,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/sriov_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/sriov_agent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over mlnx_agent.ini - name: Copying over mlnx_agent.ini
become: true become: true
@ -220,8 +204,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/mlnx_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/mlnx_agent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over eswitchd.conf - name: Copying over eswitchd.conf
become: true become: true
@ -236,8 +218,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/eswitchd.conf" dest: "{{ node_config_directory }}/{{ service_name }}/eswitchd.conf"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over dhcp_agent.ini - name: Copying over dhcp_agent.ini
become: true become: true
@ -252,8 +232,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/dhcp_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/dhcp_agent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over dnsmasq.conf - name: Copying over dnsmasq.conf
become: true become: true
@ -269,8 +247,6 @@
- "{{ node_custom_config }}/neutron/dnsmasq.conf" - "{{ node_custom_config }}/neutron/dnsmasq.conf"
- "dnsmasq.conf.j2" - "dnsmasq.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over l3_agent.ini - name: Copying over l3_agent.ini
become: true become: true
@ -288,8 +264,6 @@
when: when:
- item.key in services_need_l3_agent_ini - item.key in services_need_l3_agent_ini
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over fwaas_driver.ini - name: Copying over fwaas_driver.ini
become: true become: true
@ -308,8 +282,6 @@
- enable_neutron_fwaas | bool - enable_neutron_fwaas | bool
- item.key in services_need_fwaas_driver_ini - item.key in services_need_fwaas_driver_ini
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over metadata_agent.ini - name: Copying over metadata_agent.ini
become: true become: true
@ -323,8 +295,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/metadata_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/metadata_agent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over neutron_ovn_metadata_agent.ini - name: Copying over neutron_ovn_metadata_agent.ini
become: true become: true
@ -338,8 +308,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/neutron_ovn_metadata_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/neutron_ovn_metadata_agent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over metering_agent.ini - name: Copying over metering_agent.ini
become: true become: true
@ -353,8 +321,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/metering_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/metering_agent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over ironic_neutron_agent.ini - name: Copying over ironic_neutron_agent.ini
become: true become: true
@ -368,8 +334,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/ironic_neutron_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/ironic_neutron_agent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over bgp_dragent.ini - name: Copying over bgp_dragent.ini
become: true become: true
@ -383,8 +347,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/bgp_dragent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/bgp_dragent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over ovn_agent.ini - name: Copying over ovn_agent.ini
become: true become: true
@ -398,8 +360,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/ovn_agent.ini" dest: "{{ node_config_directory }}/{{ service_name }}/ovn_agent.ini"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over nsx.ini - name: Copying over nsx.ini
become: true become: true
@ -416,8 +376,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- neutron_plugin_agent in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_nsxp', 'vmware_dvs'] - neutron_plugin_agent in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_nsxp', 'vmware_dvs']
notify:
- "Restart {{ service_name }} container"
- name: Copy neutron-l3-agent-wrapper script - name: Copy neutron-l3-agent-wrapper script
become: true become: true
@ -429,8 +387,6 @@
dest: "{{ node_config_directory }}/{{ service_name }}/neutron-l3-agent-wrapper.sh" dest: "{{ node_config_directory }}/{{ service_name }}/neutron-l3-agent-wrapper.sh"
mode: "0770" mode: "0770"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ service_name }} container"
- name: Copying over extra ml2 plugins - name: Copying over extra ml2 plugins
become: true become: true
@ -452,8 +408,6 @@
with_nested: with_nested:
- "{{ neutron_services | dictsort }}" - "{{ neutron_services | dictsort }}"
- "{{ check_extra_ml2_plugins.files }}" - "{{ check_extra_ml2_plugins.files }}"
notify:
- "Restart {{ item.0 }} container"
- name: Copying over neutron-tls-proxy.cfg - name: Copying over neutron-tls-proxy.cfg
vars: vars:
@ -468,8 +422,6 @@
- "{{ node_custom_config }}/neutron/neutron-tls-proxy.cfg" - "{{ node_custom_config }}/neutron/neutron-tls-proxy.cfg"
- "neutron-tls-proxy.cfg.j2" - "neutron-tls-proxy.cfg.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart neutron-tls-proxy container
- name: Copying over neutron_taas.conf - name: Copying over neutron_taas.conf
become: true become: true
@ -489,5 +441,3 @@
- enable_neutron_taas | bool - enable_neutron_taas | bool
- item.key in services_need_neutron_taas_conf - item.key in services_need_neutron_taas_conf
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"

View File

@ -14,7 +14,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config"
- kolla_action != "upgrade" or not nova_safety_upgrade | bool - kolla_action != "upgrade" or not nova_safety_upgrade | bool
- name: Restart nova-novncproxy container - name: Restart nova-novncproxy container
@ -32,7 +31,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config"
- kolla_action != "upgrade" or not nova_safety_upgrade | bool - kolla_action != "upgrade" or not nova_safety_upgrade | bool
- name: Restart nova-spicehtml5proxy container - name: Restart nova-spicehtml5proxy container
@ -50,7 +48,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config"
- kolla_action != "upgrade" or not nova_safety_upgrade | bool - kolla_action != "upgrade" or not nova_safety_upgrade | bool
- name: Restart nova-serialproxy container - name: Restart nova-serialproxy container
@ -68,7 +65,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config"
- kolla_action != "upgrade" or not nova_safety_upgrade | bool - kolla_action != "upgrade" or not nova_safety_upgrade | bool
- name: Restart nova-ssh container - name: Restart nova-ssh container
@ -86,8 +82,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart nova-libvirt container - name: Restart nova-libvirt container
vars: vars:
@ -111,8 +105,6 @@
# guests running, nova_libvirt will raise error even though it is removed. # guests running, nova_libvirt will raise error even though it is removed.
retries: 5 retries: 5
until: restart_nova_libvirt is success until: restart_nova_libvirt is success
when:
- kolla_action != "config"
notify: "{{ nova_libvirt_notify }}" notify: "{{ nova_libvirt_notify }}"
# need to wait kolla_set_configs script to overwrite sasl config file # need to wait kolla_set_configs script to overwrite sasl config file
@ -164,8 +156,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart nova-compute-ironic container - name: Restart nova-compute-ironic container
vars: vars:
@ -181,8 +171,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
# nova-compute-fake is special. It will start multi numbers of container # nova-compute-fake is special. It will start multi numbers of container
# so put all variables here rather than defaults/main.yml file # so put all variables here rather than defaults/main.yml file
@ -206,8 +194,6 @@
- "/run/openvswitch:/run/openvswitch:shared" - "/run/openvswitch:/run/openvswitch:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
with_sequence: start=1 end={{ num_nova_fake_per_node }} with_sequence: start=1 end={{ num_nova_fake_per_node }}
when:
- kolla_action != "config"
# NOTE(mgoddard): After upgrading nova-compute, services will have an RPC # NOTE(mgoddard): After upgrading nova-compute, services will have an RPC
# version cap in place. We need to restart all services that communicate with # version cap in place. We need to restart all services that communicate with

View File

@ -25,5 +25,3 @@
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- not (service_name == 'nova-compute' and (filename == 'servercert.pem' or filename == 'serverkey.pem')) - not (service_name == 'nova-compute' and (filename == 'servercert.pem' or filename == 'serverkey.pem'))
loop: "{{ services | product(key_files) | list }}" loop: "{{ services | product(key_files) | list }}"
notify:
- Restart {{service_name }} container

View File

@ -57,8 +57,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/config.json" dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660" mode: "0660"
with_dict: "{{ nova_cell_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ nova_cell_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over nova.conf - name: Copying over nova.conf
become: true become: true
@ -77,8 +75,6 @@
when: when:
- item.key in nova_cell_services_require_nova_conf - item.key in nova_cell_services_require_nova_conf
with_dict: "{{ nova_cell_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ nova_cell_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over Nova compute provider config - name: Copying over Nova compute provider config
become: true become: true
@ -91,8 +87,6 @@
when: when:
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- nova_cell_compute_provider_config is defined - nova_cell_compute_provider_config is defined
notify:
- Restart nova-compute container
- name: Copying over libvirt configuration - name: Copying over libvirt configuration
become: true become: true
@ -106,8 +100,6 @@
with_items: with_items:
- { src: "qemu.conf.j2", dest: "qemu.conf" } - { src: "qemu.conf.j2", dest: "qemu.conf" }
- { src: "libvirtd.conf.j2", dest: "libvirtd.conf" } - { src: "libvirtd.conf.j2", dest: "libvirtd.conf" }
notify:
- Restart nova-libvirt container
- name: Copying over libvirt TLS keys - name: Copying over libvirt TLS keys
include_tasks: config-libvirt-tls.yml include_tasks: config-libvirt-tls.yml
@ -132,8 +124,6 @@
- { src: "auth.conf.j2", dest: "auth.conf", service: "nova-compute" } - { src: "auth.conf.j2", dest: "auth.conf", service: "nova-compute" }
- { src: "auth.conf.j2", dest: "auth.conf", service: "nova-libvirt" } - { src: "auth.conf.j2", dest: "auth.conf", service: "nova-libvirt" }
- { src: "sasl.conf.j2", dest: "sasl.conf", service: "nova-libvirt" } - { src: "sasl.conf.j2", dest: "sasl.conf", service: "nova-libvirt" }
notify:
- Restart {{ service_name }} container
- name: Copying files for nova-ssh - name: Copying files for nova-ssh
become: true become: true
@ -149,8 +139,6 @@
- { src: "id_rsa", dest: "id_rsa" } - { src: "id_rsa", dest: "id_rsa" }
- { src: "id_rsa.pub", dest: "id_rsa.pub" } - { src: "id_rsa.pub", dest: "id_rsa.pub" }
- { src: "ssh_config.j2", dest: "ssh_config" } - { src: "ssh_config.j2", dest: "ssh_config" }
notify:
- Restart nova-ssh container
- name: Copying VMware vCenter CA file - name: Copying VMware vCenter CA file
vars: vars:
@ -163,8 +151,6 @@
- nova_compute_virt_type == "vmware" - nova_compute_virt_type == "vmware"
- not vmware_vcenter_insecure | bool - not vmware_vcenter_insecure | bool
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- Restart nova-compute container
- name: Copying 'release' file for nova_compute - name: Copying 'release' file for nova_compute
vars: vars:
@ -180,8 +166,6 @@
- "{{ node_custom_config }}/nova/release" - "{{ node_custom_config }}/nova/release"
skip: true skip: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart nova-compute container
- name: Generating 'hostnqn' file for nova_compute - name: Generating 'hostnqn' file for nova_compute
vars: vars:
@ -193,8 +177,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart nova-compute container
- name: Copying over existing policy file - name: Copying over existing policy file
become: true become: true
@ -206,8 +188,6 @@
- nova_policy_file is defined - nova_policy_file is defined
- item.key in nova_cell_services_require_policy_json - item.key in nova_cell_services_require_policy_json
with_dict: "{{ nova_cell_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ nova_cell_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over vendordata file to containers - name: Copying over vendordata file to containers
vars: vars:
@ -220,8 +200,6 @@
when: when:
- vendordata_file_path is defined - vendordata_file_path is defined
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- "Restart {{ item }} container"
with_items: with_items:
- nova-compute - nova-compute
- nova-compute-ironic - nova-compute-ironic

View File

@ -14,7 +14,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config"
- kolla_action != "upgrade" or not nova_safety_upgrade | bool - kolla_action != "upgrade" or not nova_safety_upgrade | bool
- name: Restart nova-scheduler container - name: Restart nova-scheduler container
@ -32,7 +31,6 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config"
- kolla_action != "upgrade" or not nova_safety_upgrade | bool - kolla_action != "upgrade" or not nova_safety_upgrade | bool
- name: Restart nova-api container - name: Restart nova-api container
@ -50,5 +48,4 @@
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config"
- kolla_action != "upgrade" or not nova_safety_upgrade | bool - kolla_action != "upgrade" or not nova_safety_upgrade | bool

View File

@ -52,8 +52,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/config.json" dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660" mode: "0660"
with_dict: "{{ nova_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ nova_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over nova.conf - name: Copying over nova.conf
become: true become: true
@ -69,8 +67,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/nova.conf" dest: "{{ node_config_directory }}/{{ item.key }}/nova.conf"
mode: "0660" mode: "0660"
with_dict: "{{ nova_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ nova_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over existing policy file - name: Copying over existing policy file
become: true become: true
@ -82,8 +78,6 @@
- nova_policy_file is defined - nova_policy_file is defined
- item.key in nova_services_require_policy_json - item.key in nova_services_require_policy_json
with_dict: "{{ nova_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ nova_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over nova-api-wsgi.conf - name: Copying over nova-api-wsgi.conf
vars: vars:
@ -94,8 +88,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- "Restart nova-api container"
- name: Copying over vendordata file - name: Copying over vendordata file
vars: vars:
@ -108,5 +100,3 @@
when: when:
- vendordata_file_path is defined - vendordata_file_path is defined
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
notify:
- "Restart nova-api container"

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart octavia-driver-agent container - name: Restart octavia-driver-agent container
vars: vars:
@ -27,8 +25,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart octavia-health-manager container - name: Restart octavia-health-manager container
vars: vars:
@ -43,8 +39,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart octavia-housekeeping container - name: Restart octavia-housekeeping container
vars: vars:
@ -59,8 +53,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart octavia-worker container - name: Restart octavia-worker container
vars: vars:
@ -75,5 +67,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -40,8 +40,6 @@
when: when:
- octavia_policy_file is defined - octavia_policy_file is defined
with_dict: "{{ octavia_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ octavia_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:
@ -54,8 +52,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ octavia_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ octavia_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over octavia-wsgi.conf - name: Copying over octavia-wsgi.conf
vars: vars:
@ -70,8 +66,6 @@
- "{{ node_custom_config }}/octavia/octavia-wsgi.conf" - "{{ node_custom_config }}/octavia/octavia-wsgi.conf"
- "octavia-wsgi.conf.j2" - "octavia-wsgi.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart octavia-api container
- name: Copying over octavia.conf - name: Copying over octavia.conf
vars: vars:
@ -87,8 +81,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ octavia_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ octavia_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- block: - block:
@ -114,8 +106,6 @@
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
with_items: "{{ octavia_amphora_keys }}" with_items: "{{ octavia_amphora_keys }}"
notify:
- Restart octavia-worker container
- name: Copying certificate files for octavia-housekeeping - name: Copying certificate files for octavia-housekeeping
vars: vars:
@ -127,8 +117,6 @@
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
with_items: "{{ octavia_amphora_keys }}" with_items: "{{ octavia_amphora_keys }}"
notify:
- Restart octavia-housekeeping container
- name: Copying certificate files for octavia-health-manager - name: Copying certificate files for octavia-health-manager
vars: vars:
@ -140,8 +128,6 @@
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
with_items: "{{ octavia_amphora_keys }}" with_items: "{{ octavia_amphora_keys }}"
notify:
- Restart octavia-health-manager container
when: "'amphora' in octavia_provider_drivers" when: "'amphora' in octavia_provider_drivers"
vars: vars:

View File

@ -56,8 +56,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart opensearch-dashboards container - name: Restart opensearch-dashboards container
vars: vars:
@ -73,5 +71,3 @@
name: "{{ service.container_name }}" name: "{{ service.container_name }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -20,8 +20,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ opensearch_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ opensearch_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over opensearch service config file - name: Copying over opensearch service config file
vars: vars:
@ -36,8 +34,6 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart opensearch container
- name: Copying over opensearch-dashboards config file - name: Copying over opensearch-dashboards config file
vars: vars:
@ -51,5 +47,3 @@
mode: "0660" mode: "0660"
become: true become: true
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart opensearch-dashboards container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck }}" healthcheck: "{{ service.healthcheck }}"
when:
- kolla_action != "config"
notify: notify:
- Waiting for openvswitch_db service to be ready - Waiting for openvswitch_db service to be ready
@ -40,5 +38,3 @@
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck }}" healthcheck: "{{ service.healthcheck }}"
when:
- kolla_action != "config"

View File

@ -16,8 +16,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/config.json" dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660" mode: "0660"
with_dict: "{{ openvswitch_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ openvswitch_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over ovs-vsctl wrapper - name: Copying over ovs-vsctl wrapper
vars: vars:

View File

@ -11,5 +11,3 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -16,5 +16,3 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ ovn_controller_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ovn_controller_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -11,8 +11,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart ovn-sb-db container - name: Restart ovn-sb-db container
vars: vars:
@ -26,8 +24,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart ovn-northd container - name: Restart ovn-northd container
vars: vars:
@ -41,5 +37,3 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -16,5 +16,3 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ ovn_db_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ovn_db_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -11,8 +11,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
notify: notify:
- Waiting the ovs db service to be ready - Waiting the ovs db service to be ready
- Ensuring ovsdpdk bridges are properly setup indexed - Ensuring ovsdpdk bridges are properly setup indexed
@ -64,8 +62,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(True) }}" privileged: "{{ service.privileged | default(True) }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Ensuring ovsdpdk bridges are properly setup named - name: Ensuring ovsdpdk bridges are properly setup named
vars: vars:

View File

@ -16,8 +16,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/config.json" dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660" mode: "0660"
with_dict: "{{ ovsdpdk_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ ovsdpdk_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying ovs-dpdkctl tool - name: Copying ovs-dpdkctl tool
become: true become: true

View File

@ -12,5 +12,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -39,8 +39,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/config.json" dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660" mode: "0660"
with_dict: "{{ placement_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ placement_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over placement.conf - name: Copying over placement.conf
become: true become: true
@ -56,8 +54,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/placement.conf" dest: "{{ node_config_directory }}/{{ item.key }}/placement.conf"
mode: "0660" mode: "0660"
with_dict: "{{ placement_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ placement_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over placement-api wsgi configuration - name: Copying over placement-api wsgi configuration
become: true become: true
@ -72,8 +68,6 @@
- "{{ node_custom_config }}/placement/{{ inventory_hostname }}/placement-api-wsgi.conf" - "{{ node_custom_config }}/placement/{{ inventory_hostname }}/placement-api-wsgi.conf"
- "{{ node_custom_config }}/placement/placement-api-wsgi.conf" - "{{ node_custom_config }}/placement/placement-api-wsgi.conf"
- "placement-api-wsgi.conf.j2" - "placement-api-wsgi.conf.j2"
notify:
- Restart placement-api container
- name: Copying over migrate-db.rc.j2 configuration - name: Copying over migrate-db.rc.j2 configuration
become: true become: true
@ -84,8 +78,6 @@
dest: "{{ node_config_directory }}/placement-api/migrate-db.rc" dest: "{{ node_config_directory }}/placement-api/migrate-db.rc"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart placement-api container
- name: Copying over existing policy file - name: Copying over existing policy file
become: true become: true
@ -96,5 +88,3 @@
when: when:
- placement_policy_file is defined - placement_policy_file is defined
with_dict: "{{ placement_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ placement_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"

View File

@ -11,8 +11,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart prometheus-node-exporter container - name: Restart prometheus-node-exporter container
vars: vars:
@ -27,8 +25,6 @@
pid_mode: "{{ service.pid_mode | default(omit) }}" pid_mode: "{{ service.pid_mode | default(omit) }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart prometheus-mysqld-exporter container - name: Restart prometheus-mysqld-exporter container
vars: vars:
@ -42,8 +38,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart prometheus-memcached-exporter container - name: Restart prometheus-memcached-exporter container
vars: vars:
@ -57,8 +51,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart prometheus-cadvisor container - name: Restart prometheus-cadvisor container
vars: vars:
@ -72,8 +64,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart prometheus-alertmanager container - name: Restart prometheus-alertmanager container
vars: vars:
@ -87,8 +77,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart prometheus-openstack-exporter container - name: Restart prometheus-openstack-exporter container
vars: vars:
@ -103,8 +91,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
environment: "{{ service.environment | default(omit) }}" environment: "{{ service.environment | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart prometheus-elasticsearch-exporter container - name: Restart prometheus-elasticsearch-exporter container
vars: vars:
@ -118,8 +104,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart prometheus-blackbox-exporter container - name: Restart prometheus-blackbox-exporter container
vars: vars:
@ -133,8 +117,6 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- name: Restart prometheus-libvirt-exporter container - name: Restart prometheus-libvirt-exporter container
vars: vars:
@ -148,5 +130,3 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -20,8 +20,6 @@
dest: "{{ node_config_directory }}/{{ item.key }}/config.json" dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660" mode: "0660"
with_dict: "{{ prometheus_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ prometheus_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Find custom prometheus alert rules files - name: Find custom prometheus alert rules files
find: find:
@ -46,8 +44,6 @@
- enable_prometheus_alertmanager | bool - enable_prometheus_alertmanager | bool
- prometheus_alert_rules is defined and prometheus_alert_rules.files | length > 0 - prometheus_alert_rules is defined and prometheus_alert_rules.files | length > 0
with_items: "{{ prometheus_alert_rules.files }}" with_items: "{{ prometheus_alert_rules.files }}"
notify:
- Restart prometheus-server container
- name: Find prometheus common config overrides - name: Find prometheus common config overrides
find: find:
@ -86,8 +82,6 @@
- "{{ node_custom_config }}/prometheus/{{ inventory_hostname }}/prometheus.yml" - "{{ node_custom_config }}/prometheus/{{ inventory_hostname }}/prometheus.yml"
- "{{ node_custom_config }}/prometheus/prometheus.yml" - "{{ node_custom_config }}/prometheus/prometheus.yml"
- "{{ role_path }}/templates/prometheus.yml.j2" - "{{ role_path }}/templates/prometheus.yml.j2"
notify:
- Restart prometheus-server container
- name: Copying over prometheus web config file - name: Copying over prometheus web config file
become: true become: true
@ -102,8 +96,6 @@
- "{{ node_custom_config }}/prometheus/{{ inventory_hostname }}/web.yml" - "{{ node_custom_config }}/prometheus/{{ inventory_hostname }}/web.yml"
- "{{ node_custom_config }}/prometheus/web.yml" - "{{ node_custom_config }}/prometheus/web.yml"
- "{{ role_path }}/templates/prometheus-web.yml.j2" - "{{ role_path }}/templates/prometheus-web.yml.j2"
notify:
- Restart prometheus-server container
- name: Copying over prometheus alertmanager config file - name: Copying over prometheus alertmanager config file
become: true become: true
@ -118,8 +110,6 @@
- "{{ node_custom_config }}/prometheus/{{ inventory_hostname }}/prometheus-alertmanager.yml" - "{{ node_custom_config }}/prometheus/{{ inventory_hostname }}/prometheus-alertmanager.yml"
- "{{ node_custom_config }}/prometheus/prometheus-alertmanager.yml" - "{{ node_custom_config }}/prometheus/prometheus-alertmanager.yml"
- "{{ role_path }}/templates/prometheus-alertmanager.yml.j2" - "{{ role_path }}/templates/prometheus-alertmanager.yml.j2"
notify:
- Restart prometheus-alertmanager container
- name: Find custom Alertmanager alert notification templates - name: Find custom Alertmanager alert notification templates
find: find:
@ -143,8 +133,6 @@
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- alertmanager_notification_templates is defined and alertmanager_notification_templates.files | length > 0 - alertmanager_notification_templates is defined and alertmanager_notification_templates.files | length > 0
with_items: "{{ alertmanager_notification_templates.files }}" with_items: "{{ alertmanager_notification_templates.files }}"
notify:
- Restart prometheus-alertmanager container
- name: Copying over my.cnf for mysqld_exporter - name: Copying over my.cnf for mysqld_exporter
become: true become: true
@ -158,8 +146,6 @@
dest: "{{ node_config_directory }}/prometheus-mysqld-exporter/my.cnf" dest: "{{ node_config_directory }}/prometheus-mysqld-exporter/my.cnf"
mode: "0660" mode: "0660"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart prometheus-mysqld-exporter container
- name: Copying cloud config file for openstack exporter - name: Copying cloud config file for openstack exporter
become: true become: true
@ -174,8 +160,6 @@
- "{{ node_custom_config }}/prometheus-openstack-exporter/{{ inventory_hostname }}/clouds.yml" - "{{ node_custom_config }}/prometheus-openstack-exporter/{{ inventory_hostname }}/clouds.yml"
- "{{ node_custom_config }}/prometheus-openstack-exporter/clouds.yml" - "{{ node_custom_config }}/prometheus-openstack-exporter/clouds.yml"
- "{{ role_path }}/templates/clouds.yml.j2" - "{{ role_path }}/templates/clouds.yml.j2"
notify:
- Restart prometheus-openstack-exporter container
- name: Copying config file for blackbox exporter - name: Copying config file for blackbox exporter
become: true become: true
@ -190,8 +174,6 @@
- "{{ node_custom_config }}/prometheus/{{ inventory_hostname }}/prometheus-blackbox-exporter.yml" - "{{ node_custom_config }}/prometheus/{{ inventory_hostname }}/prometheus-blackbox-exporter.yml"
- "{{ node_custom_config }}/prometheus/prometheus-blackbox-exporter.yml" - "{{ node_custom_config }}/prometheus/prometheus-blackbox-exporter.yml"
- "{{ role_path }}/templates/prometheus-blackbox-exporter.yml.j2" - "{{ role_path }}/templates/prometheus-blackbox-exporter.yml.j2"
notify:
- Restart prometheus-blackbox-exporter container
- block: - block:
- name: Find extra prometheus server config files - name: Find extra prometheus server config files
@ -228,8 +210,6 @@
dest: "{{ node_config_directory }}/prometheus-server/{{ relpath }}" dest: "{{ node_config_directory }}/prometheus-server/{{ relpath }}"
mode: "0660" mode: "0660"
with_items: "{{ prometheus_config_extras_result.files | default([]) | map(attribute='path') | list }}" with_items: "{{ prometheus_config_extras_result.files | default([]) | map(attribute='path') | list }}"
notify:
- Restart prometheus-server container
vars: vars:
base: "{{ node_custom_config }}/prometheus/" base: "{{ node_custom_config }}/prometheus/"
service: "{{ prometheus_services['prometheus-server'] }}" service: "{{ prometheus_services['prometheus-server'] }}"

View File

@ -2,5 +2,3 @@
- name: Restart rabbitmq container - name: Restart rabbitmq container
group_by: group_by:
key: "{{ project_name }}_restart" key: "{{ project_name }}_restart"
when:
- kolla_action != "config"

View File

@ -16,8 +16,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ rabbitmq_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ rabbitmq_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart rabbitmq container
- name: Copying over rabbitmq-env.conf - name: Copying over rabbitmq-env.conf
become: true become: true
@ -32,8 +30,6 @@
- "{{ node_custom_config }}/rabbitmq/rabbitmq-env.conf" - "{{ node_custom_config }}/rabbitmq/rabbitmq-env.conf"
- "rabbitmq-env.conf.j2" - "rabbitmq-env.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart rabbitmq container
- name: Copying over rabbitmq.conf - name: Copying over rabbitmq.conf
become: true become: true
@ -48,8 +44,6 @@
- "{{ node_custom_config }}/rabbitmq/rabbitmq.conf" - "{{ node_custom_config }}/rabbitmq/rabbitmq.conf"
- "rabbitmq.conf.j2" - "rabbitmq.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart rabbitmq container
- name: Copying over erl_inetrc - name: Copying over erl_inetrc
become: true become: true
@ -64,8 +58,6 @@
- "{{ node_custom_config }}/rabbitmq/erl_inetrc" - "{{ node_custom_config }}/rabbitmq/erl_inetrc"
- "erl_inetrc.j2" - "erl_inetrc.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart rabbitmq container
- name: Copying over advanced.config - name: Copying over advanced.config
become: true become: true
@ -80,8 +72,6 @@
- "{{ node_custom_config }}/rabbitmq/advanced.config" - "{{ node_custom_config }}/rabbitmq/advanced.config"
- "advanced.config.j2" - "advanced.config.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart rabbitmq container
- name: Copying over definitions.json - name: Copying over definitions.json
become: true become: true
@ -96,8 +86,6 @@
- "{{ node_custom_config }}/rabbitmq/definitions.json" - "{{ node_custom_config }}/rabbitmq/definitions.json"
- "definitions.json.j2" - "definitions.json.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart rabbitmq container
- name: Copying over enabled_plugins - name: Copying over enabled_plugins
become: true become: true
@ -112,8 +100,6 @@
- "{{ node_custom_config }}/rabbitmq/enabled_plugins" - "{{ node_custom_config }}/rabbitmq/enabled_plugins"
- "enabled_plugins.j2" - "enabled_plugins.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart rabbitmq container
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart redis-sentinel container - name: Restart redis-sentinel container
vars: vars:
@ -29,5 +27,3 @@
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -16,8 +16,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ redis_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ redis_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over redis config files - name: Copying over redis config files
template: template:
@ -26,5 +24,3 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ redis_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ redis_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart skyline-console container - name: Restart skyline-console container
vars: vars:
@ -28,5 +26,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -22,8 +22,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ skyline_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ skyline_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over gunicorn.py files for services - name: Copying over gunicorn.py files for services
vars: vars:
@ -37,8 +35,6 @@
with_first_found: with_first_found:
- "{{ node_custom_config }}/skyline/gunicorn.py" - "{{ node_custom_config }}/skyline/gunicorn.py"
- "gunicorn.py.j2" - "gunicorn.py.j2"
notify:
- "Restart skyline-apiserver container"
- name: Copying over nginx.conf files for services - name: Copying over nginx.conf files for services
vars: vars:
@ -52,8 +48,6 @@
with_first_found: with_first_found:
- "{{ node_custom_config }}/skyline/nginx.conf" - "{{ node_custom_config }}/skyline/nginx.conf"
- "nginx.conf.j2" - "nginx.conf.j2"
notify:
- "Restart skyline-console container"
- name: Copying over config.json files for services - name: Copying over config.json files for services
template: template:
@ -62,8 +56,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ skyline_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ skyline_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over custom logos - name: Copying over custom logos
become: true become: true
@ -77,5 +69,3 @@
- service | service_enabled_and_mapped_to_host - service | service_enabled_and_mapped_to_host
- skyline_custom_logos | length > 0 - skyline_custom_logos | length > 0
with_items: "{{ skyline_custom_logos }}" with_items: "{{ skyline_custom_logos }}"
notify:
- Restart skyline-console container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart tacker-server container - name: Restart tacker-server container
vars: vars:
@ -28,5 +26,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -39,8 +39,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ tacker_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ tacker_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over tacker.conf - name: Copying over tacker.conf
vars: vars:
@ -56,8 +54,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ tacker_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ tacker_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -68,5 +64,3 @@
when: when:
- tacker_policy_file is defined - tacker_policy_file is defined
with_dict: "{{ tacker_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ tacker_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -15,5 +15,3 @@
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"

View File

@ -20,8 +20,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ telegraf_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ telegraf_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart telegraf container
- name: Copying over telegraf config file - name: Copying over telegraf config file
vars: vars:
@ -36,8 +34,6 @@
- "{{ node_custom_config }}/telegraf/{{ inventory_hostname }}/telegraf.conf" - "{{ node_custom_config }}/telegraf/{{ inventory_hostname }}/telegraf.conf"
- "{{ node_custom_config }}/telegraf/telegraf.conf" - "{{ node_custom_config }}/telegraf/telegraf.conf"
- "telegraf.conf.j2" - "telegraf.conf.j2"
notify:
- Restart telegraf container
- name: Copying over telegraf plugin files - name: Copying over telegraf plugin files
vars: vars:
@ -50,5 +46,3 @@
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
with_fileglob: with_fileglob:
- "{{ role_path }}/templates/config/*.conf" - "{{ role_path }}/templates/config/*.conf"
notify:
- Restart telegraf container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart trove-conductor container - name: Restart trove-conductor container
vars: vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart trove-taskmanager container - name: Restart trove-taskmanager container
vars: vars:
@ -44,5 +40,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -39,8 +39,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ trove_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ trove_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over trove-wsgi.conf - name: Copying over trove-wsgi.conf
vars: vars:
@ -55,8 +53,6 @@
- "{{ node_custom_config }}/trove/trove-wsgi.conf" - "{{ node_custom_config }}/trove/trove-wsgi.conf"
- "trove-wsgi.conf.j2" - "trove-wsgi.conf.j2"
when: service | service_enabled_and_mapped_to_host when: service | service_enabled_and_mapped_to_host
notify:
- Restart trove-api container
- name: Copying over trove-guestagent.conf - name: Copying over trove-guestagent.conf
vars: vars:
@ -74,8 +70,6 @@
when: when:
- item.key in services_need_confs - item.key in services_need_confs
with_dict: "{{ trove_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ trove_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over trove.conf - name: Copying over trove.conf
vars: vars:
@ -91,8 +85,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ trove_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ trove_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -102,5 +94,3 @@
when: when:
- trove_policy_file is defined - trove_policy_file is defined
with_dict: "{{ trove_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ trove_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart venus-manager container - name: Restart venus-manager container
vars: vars:
@ -28,5 +26,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

View File

@ -39,8 +39,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ venus_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ venus_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over venus.conf - name: Copying over venus.conf
vars: vars:
@ -56,8 +54,6 @@
mode: "0660" mode: "0660"
become: true become: true
with_dict: "{{ venus_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ venus_services | select_services_enabled_and_mapped_to_host }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
@ -67,5 +63,3 @@
when: when:
- venus_policy_file is defined - venus_policy_file is defined
with_dict: "{{ venus_services | select_services_enabled_and_mapped_to_host }}" with_dict: "{{ venus_services | select_services_enabled_and_mapped_to_host }}"
notify:
- Restart {{ item.key }} container

View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart watcher-engine container - name: Restart watcher-engine container
vars: vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart watcher-api container - name: Restart watcher-api container
vars: vars:
@ -44,5 +40,3 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}" healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

Some files were not shown because too many files have changed in this diff Show More