openstack/kolla-ansible
Code Issues Proposed changes

Merge "Performance: Don't notify handlers during config"

Browse Source
This commit is contained in:
Zuul 2024-12-03 16:24:22 +00:00 committed by Gerrit Code Review
commit 7703e895bd
104 changed files with 31 additions and 845 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/aodh/handlers/main.yml
View File

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

8
ansible/roles/aodh/tasks/config.yml
View File

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

6
ansible/roles/barbican/handlers/main.yml
View File

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

10
ansible/roles/barbican/tasks/config.yml
View File

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

4
ansible/roles/blazar/handlers/main.yml
View File

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

6
ansible/roles/blazar/tasks/config.yml
View File

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

8
ansible/roles/ceilometer/handlers/main.yml
View File

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

26
ansible/roles/ceilometer/tasks/config.yml
View File

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

8
ansible/roles/cinder/handlers/main.yml
View File

@ -12,8 +12,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart cinder-scheduler container
vars:
@ -28,8 +26,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart cinder-volume container
vars:
@ -47,8 +43,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
- name: Restart cinder-backup container
vars:
@ -64,8 +58,6 @@
volumes: "{{ service.volumes | reject('equalto', '') | list }}"
dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"
# 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

12
ansible/roles/cinder/tasks/config.yml
View File

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

4
ansible/roles/cloudkitty/handlers/main.yml
View File

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

10
ansible/roles/cloudkitty/tasks/config.yml
View File

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

2
ansible/roles/collectd/handlers/main.yml
View File

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

4
ansible/roles/collectd/tasks/config.yml
View File

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

6
ansible/roles/common/handlers/main.yml
View File

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

8
ansible/roles/common/tasks/config.yml
View File

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

6
ansible/roles/cyborg/handlers/main.yml
View File

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

8
ansible/roles/cyborg/tasks/config.yml
View File

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

14
ansible/roles/designate/handlers/main.yml
View File

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

14
ansible/roles/designate/tasks/config.yml
View File

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

4
ansible/roles/etcd/handlers/main.yml
View File

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

2
ansible/roles/etcd/tasks/config.yml
View File

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

4
ansible/roles/glance/handlers/main.yml
View File

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

16
ansible/roles/glance/tasks/config.yml
View File

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

6
ansible/roles/gnocchi/handlers/main.yml
View File

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

8
ansible/roles/gnocchi/tasks/config.yml
View File

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

3
ansible/roles/grafana/handlers/main.yml
View File

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

12
ansible/roles/grafana/tasks/config.yml
View File

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

6
ansible/roles/hacluster/handlers/main.yml
View File

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

10
ansible/roles/hacluster/tasks/config.yml
View File

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

6
ansible/roles/heat/handlers/main.yml
View File

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

10
ansible/roles/heat/tasks/config.yml
View File

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

2
ansible/roles/horizon/handlers/main.yml
View File

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

12
ansible/roles/horizon/tasks/config.yml
View File

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

2
ansible/roles/influxdb/handlers/main.yml
View File

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

4
ansible/roles/influxdb/tasks/config.yml
View File

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

14
ansible/roles/ironic/handlers/main.yml
View File

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

33
ansible/roles/ironic/tasks/config.yml
View File

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

4
ansible/roles/iscsi/handlers/main.yml
View File

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

2
ansible/roles/iscsi/tasks/config.yml
View File

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

6
ansible/roles/keystone/handlers/main.yml
View File

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

18
ansible/roles/keystone/tasks/config.yml
View File

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

2
ansible/roles/kuryr/handlers/main.yml
View File

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

8
ansible/roles/kuryr/tasks/config.yml
View File

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

4
ansible/roles/letsencrypt/handlers/main.yml
View File

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

6
ansible/roles/letsencrypt/tasks/config.yml
View File

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

24
ansible/roles/loadbalancer/tasks/config.yml
View File

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

8
ansible/roles/loadbalancer/tasks/copy-certs.yml
View File

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

4
ansible/roles/magnum/handlers/main.yml
View File

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

8
ansible/roles/magnum/tasks/config.yml
View File

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

8
ansible/roles/manila/handlers/main.yml
View File

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

8
ansible/roles/manila/tasks/config.yml
View File

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

3
ansible/roles/mariadb/handlers/main.yml
View File

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

4
ansible/roles/mariadb/tasks/config.yml
View File

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

8
ansible/roles/masakari/handlers/main.yml
View File

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

14
ansible/roles/masakari/tasks/config.yml
View File

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

2
ansible/roles/memcached/handlers/main.yml
View File

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

1
ansible/roles/memcached/tasks/config.yml
View File

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

8
ansible/roles/mistral/handlers/main.yml
View File

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

8
ansible/roles/mistral/tasks/config.yml
View File

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

2
ansible/roles/multipathd/handlers/main.yml
View File

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

4
ansible/roles/multipathd/tasks/config.yml
View File

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

37
ansible/roles/neutron/handlers/main.yml
View File

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

50
ansible/roles/neutron/tasks/config.yml
View File

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

14
ansible/roles/nova-cell/handlers/main.yml
View File

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

2
ansible/roles/nova-cell/tasks/config-libvirt-tls.yml
View File

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

22
ansible/roles/nova-cell/tasks/config.yml
View File

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

3
ansible/roles/nova/handlers/main.yml
View File

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

10
ansible/roles/nova/tasks/config.yml
View File

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

10
ansible/roles/octavia/handlers/main.yml
View File

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

14
ansible/roles/octavia/tasks/config.yml
View File

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

4
ansible/roles/opensearch/handlers/main.yml
View File

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

6
ansible/roles/opensearch/tasks/config.yml
View File

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

4
ansible/roles/openvswitch/handlers/main.yml
View File

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

2
ansible/roles/openvswitch/tasks/config.yml
View File

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

2
ansible/roles/ovn-controller/handlers/main.yml
View File

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

2
ansible/roles/ovn-controller/tasks/config.yml
View File

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

6
ansible/roles/ovn-db/handlers/main.yml
View File

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

2
ansible/roles/ovn-db/tasks/config.yml
View File

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

4
ansible/roles/ovs-dpdk/handlers/main.yml
View File

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

2
ansible/roles/ovs-dpdk/tasks/config.yml
View File

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

2
ansible/roles/placement/handlers/main.yml
View File

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

10
ansible/roles/placement/tasks/config.yml
View File

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

20
ansible/roles/prometheus/handlers/main.yml
View File

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

20
ansible/roles/prometheus/tasks/config.yml
View File

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

2
ansible/roles/rabbitmq/handlers/main.yml
View File

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

14
ansible/roles/rabbitmq/tasks/config.yml
View File

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

4
ansible/roles/redis/handlers/main.yml
View File

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

4
ansible/roles/redis/tasks/config.yml
View File

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

4
ansible/roles/skyline/handlers/main.yml
View File

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

10
ansible/roles/skyline/tasks/config.yml
View File

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

4
ansible/roles/tacker/handlers/main.yml
View File

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

6
ansible/roles/tacker/tasks/config.yml
View File

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

2
ansible/roles/telegraf/handlers/main.yml
View File

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

6
ansible/roles/telegraf/tasks/config.yml
View File

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

6
ansible/roles/trove/handlers/main.yml
View File

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

10
ansible/roles/trove/tasks/config.yml
View File

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

4
ansible/roles/venus/handlers/main.yml
View File

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

6
ansible/roles/venus/tasks/config.yml
View File

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

6
ansible/roles/watcher/handlers/main.yml
View File

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