diff --git a/ansible/roles/aodh/tasks/config.yml b/ansible/roles/aodh/tasks/config.yml index 90179933a9..971477aec0 100644 --- a/ansible/roles/aodh/tasks/config.yml +++ b/ansible/roles/aodh/tasks/config.yml @@ -53,6 +53,11 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/aodh/policy.json" - dest: "{{ node_config_directory }}/aodh/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "aodh-api" + - "aodh-evaluator" + - "aodh-listener" + - "aodh-notifier" when: aodh_policy.stat.exists diff --git a/ansible/roles/barbican/tasks/config.yml b/ansible/roles/barbican/tasks/config.yml index fab9b3ddac..0b71c1ce5f 100644 --- a/ansible/roles/barbican/tasks/config.yml +++ b/ansible/roles/barbican/tasks/config.yml @@ -59,6 +59,10 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/barbican/policy.json" - dest: "{{ node_config_directory }}/barbican/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "barbican-api" + - "barbican-keystone-listener" + - "barbican-worker" when: barbican_policy.stat.exists diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml index 63c77f38d6..e4c6cdf7b3 100644 --- a/ansible/roles/ceilometer/tasks/config.yml +++ b/ansible/roles/ceilometer/tasks/config.yml @@ -67,6 +67,12 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/ceilometer/policy.json" - dest: "{{ node_config_directory }}/ceilometer/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "ceilometer-notification" + - "ceilometer-collector" + - "ceilometer-api" + - "ceilometer-central" + - "ceilometer-compute" when: ceilometer_policy.stat.exists diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml index 9daa82c444..49f1879464 100644 --- a/ansible/roles/cinder/tasks/config.yml +++ b/ansible/roles/cinder/tasks/config.yml @@ -46,7 +46,12 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/cinder/policy.json" - dest: "{{ node_config_directory }}/cinder/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "cinder-api" + - "cinder-backup" + - "cinder-scheduler" + - "cinder-volume" when: cinder_policy.stat.exists diff --git a/ansible/roles/cloudkitty/tasks/config.yml b/ansible/roles/cloudkitty/tasks/config.yml index ea3d13cbbf..d614334ca4 100644 --- a/ansible/roles/cloudkitty/tasks/config.yml +++ b/ansible/roles/cloudkitty/tasks/config.yml @@ -40,6 +40,9 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/cloudkitty/policy.json" - dest: "{{ node_config_directory }}/cloudkitty/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "cloudkitty-api" + - "cloudkitty-processor" when: cloudkitty_policy.stat.exists diff --git a/ansible/roles/congress/tasks/config.yml b/ansible/roles/congress/tasks/config.yml index 0e9a631356..f447726597 100644 --- a/ansible/roles/congress/tasks/config.yml +++ b/ansible/roles/congress/tasks/config.yml @@ -43,6 +43,10 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/congress/policy.json" - dest: "{{ node_config_directory }}/congress/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "congress-api" + - "congress-policy-engine" + - "congress-datasource" when: congress_policy.stat.exists diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index 743815ba88..d88993353c 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/ansible/roles/glance/tasks/config.yml @@ -37,6 +37,8 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/glance/policy.json" - dest: "{{ node_config_directory }}/glance/policy.json" + dest: "{{ node_config_directory }}/{{ item.service }}/policy.json" when: - glance_policy.stat.exists + - inventory_hostname in groups[item.group] + - glance_policy.stat.exists + with_items: "{{ glance_service_groups }}" diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml index b6fa16dd07..5e74dca266 100644 --- a/ansible/roles/gnocchi/tasks/config.yml +++ b/ansible/roles/gnocchi/tasks/config.yml @@ -58,6 +58,10 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/gnocchi/policy.json" - dest: "{{ node_config_directory }}/gnocchi/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "gnocchi-api" + - "gnocchi-statsd" + - "gnocchi-metricd" when: gnocchi_policy.stat.exists diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml index dca462a508..125062f905 100644 --- a/ansible/roles/heat/tasks/config.yml +++ b/ansible/roles/heat/tasks/config.yml @@ -50,6 +50,10 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/heat/policy.json" - dest: "{{ node_config_directory }}/heat/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "heat-api" + - "heat-api-cfn" + - "heat-engine" when: heat_policy.stat.exists diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml index 797b494824..d082ecf088 100644 --- a/ansible/roles/ironic/tasks/config.yml +++ b/ansible/roles/ironic/tasks/config.yml @@ -45,6 +45,11 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/ironic/policy.json" - dest: "{{ node_config_directory }}/ironic/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "ironic-api" + - "ironic-conductor" + - "ironic-inspector" + - "ironic-pxe" when: ironic_policy.stat.exists diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml index e531d68690..6951545716 100644 --- a/ansible/roles/keystone/tasks/config.yml +++ b/ansible/roles/keystone/tasks/config.yml @@ -62,7 +62,10 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/keystone/policy.json" - dest: "{{ node_config_directory }}/keystone/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "keystone" + - "keystone-fernet" when: keystone_policy.stat.exists diff --git a/ansible/roles/magnum/tasks/config.yml b/ansible/roles/magnum/tasks/config.yml index 5baa4a6ca8..2fa679bc61 100644 --- a/ansible/roles/magnum/tasks/config.yml +++ b/ansible/roles/magnum/tasks/config.yml @@ -40,6 +40,9 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/magnum/policy.json" - dest: "{{ node_config_directory }}/magnum/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "magnum-api" + - "magnum-conductor" when: magnum_policy.stat.exists diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml index 5e03b4d47d..c975cdd75e 100644 --- a/ansible/roles/manila/tasks/config.yml +++ b/ansible/roles/manila/tasks/config.yml @@ -63,6 +63,11 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/manila/policy.json" - dest: "{{ node_config_directory }}/manila/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "manila-api" + - "manila-data" + - "manila-scheduler" + - "manila-share" when: manila_policy.stat.exists diff --git a/ansible/roles/mistral/tasks/config.yml b/ansible/roles/mistral/tasks/config.yml index 723074eac4..62f12d18a7 100644 --- a/ansible/roles/mistral/tasks/config.yml +++ b/ansible/roles/mistral/tasks/config.yml @@ -43,6 +43,10 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/mistral/policy.json" - dest: "{{ node_config_directory }}/mistral/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "mistral-api" + - "mistral-engine" + - "mistral-executor" when: mistral_policy.stat.exists diff --git a/ansible/roles/murano/tasks/config.yml b/ansible/roles/murano/tasks/config.yml index 779c277d54..725703f72a 100644 --- a/ansible/roles/murano/tasks/config.yml +++ b/ansible/roles/murano/tasks/config.yml @@ -40,6 +40,9 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/murano/policy.json" - dest: "{{ node_config_directory }}/murano/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "murano-api" + - "murano-engine" when: murano_policy.stat.exists diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index 82921cd96e..bc18d03808 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -191,6 +191,15 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/neutron/policy.json" - dest: "{{ node_config_directory }}/neutron/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "neutron-dhcp-agent" + - "neutron-l3-agent" + - "neutron-linuxbridge-agent" + - "neutron-metadata-agent" + - "neutron-openvswitch-agent" + - "neutron-server" + - "neutron-lbaas-agent" + - "neutron-vpnaas-agent" when: neutron_policy.stat.exists diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml index b8750b9300..e7c7a06e3a 100644 --- a/ansible/roles/nova/tasks/config.yml +++ b/ansible/roles/nova/tasks/config.yml @@ -91,6 +91,15 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/nova/policy.json" - dest: "{{ node_config_directory }}/nova/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "nova-api" + - "nova-compute" + - "nova-compute-ironic" + - "nova-conductor" + - "nova-consoleauth" + - "nova-novncproxy" + - "nova-scheduler" + - "nova-spicehtml5proxy" when: nova_policy.stat.exists diff --git a/ansible/roles/sahara/tasks/config.yml b/ansible/roles/sahara/tasks/config.yml index a83df50cae..59cda53143 100644 --- a/ansible/roles/sahara/tasks/config.yml +++ b/ansible/roles/sahara/tasks/config.yml @@ -40,6 +40,9 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/sahara/policy.json" - dest: "{{ node_config_directory }}/sahara/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "sahara-api" + - "sahara-engine" when: sahara_policy.stat.exists diff --git a/ansible/roles/searchlight/tasks/config.yml b/ansible/roles/searchlight/tasks/config.yml index 4237b6bdd9..1bec9a7ac5 100644 --- a/ansible/roles/searchlight/tasks/config.yml +++ b/ansible/roles/searchlight/tasks/config.yml @@ -38,6 +38,9 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/searchlight/policy.json" - dest: "{{ node_config_directory }}/searchlight/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "searchlight-api" + - "searchlight-listener" when: searchlight_policy.stat.exists diff --git a/ansible/roles/senlin/tasks/config.yml b/ansible/roles/senlin/tasks/config.yml index 17ff0f83aa..54773529b4 100644 --- a/ansible/roles/senlin/tasks/config.yml +++ b/ansible/roles/senlin/tasks/config.yml @@ -40,6 +40,9 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/senlin/policy.json" - dest: "{{ node_config_directory }}/senlin/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "senlin-api" + - "senlin-engine" when: senlin_policy.stat.exists diff --git a/ansible/roles/swift/tasks/config.yml b/ansible/roles/swift/tasks/config.yml index 10c26de5a6..3b81038ee9 100644 --- a/ansible/roles/swift/tasks/config.yml +++ b/ansible/roles/swift/tasks/config.yml @@ -160,6 +160,21 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/swift/policy.json" - dest: "{{ node_config_directory }}/swift/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "swift-account-auditor" + - "swift-account-reaper" + - "swift-account-replicator" + - "swift-account-server" + - "swift-container-auditor" + - "swift-container-replicator" + - "swift-container-server" + - "swift-container-updater" + - "swift-object-auditor" + - "swift-object-expirer" + - "swift-object-replicator" + - "swift-object-server" + - "swift-object-updater" + - "swift-proxy-server" when: swift_policy.stat.exists diff --git a/ansible/roles/watcher/tasks/config.yml b/ansible/roles/watcher/tasks/config.yml index 9d4ae9f7a9..9f32f9398f 100644 --- a/ansible/roles/watcher/tasks/config.yml +++ b/ansible/roles/watcher/tasks/config.yml @@ -43,6 +43,10 @@ - name: Copying over existing policy.json template: src: "{{ node_custom_config }}/watcher/policy.json" - dest: "{{ node_config_directory }}/watcher/policy.json" + dest: "{{ node_config_directory }}/{{ item }}/policy.json" + with_items: + - "watcher-api" + - "watcher-engine" + - "watcher-applier" when: watcher_policy.stat.exists