Merge "Performance: remove unnecessary conditions from includes"

ansible/roles/aodh/tasks/deploy.yml

@@ -3,10 +3,6 @@
   when: inventory_hostname in groups['aodh-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['aodh-api'] or
-        inventory_hostname in groups['aodh-evaluator'] or
-        inventory_hostname in groups['aodh-listener'] or
-        inventory_hostname in groups['aodh-notifier']
 
 - include_tasks: clone.yml
   when: aodh_dev_mode | bool

ansible/roles/barbican/tasks/deploy.yml

@@ -3,9 +3,6 @@
   when: inventory_hostname in groups['barbican-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['barbican-api'] or
-        inventory_hostname in groups['barbican-worker'] or
-        inventory_hostname in groups['barbican-keystone-listener']
 
 - include_tasks: clone.yml
   when: barbican_dev_mode | bool

ansible/roles/blazar/tasks/deploy.yml

@@ -3,8 +3,6 @@
   when: inventory_hostname in groups['blazar-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['blazar-api'] or
-        inventory_hostname in groups['blazar-manager']
 
 - include_tasks: clone.yml
   when: blazar_dev_mode | bool

ansible/roles/ceilometer/tasks/deploy.yml

@@ -3,8 +3,6 @@
   when: inventory_hostname in groups['ceilometer']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['ceilometer'] or
-        inventory_hostname in groups['compute']
 
 - include_tasks: clone.yml
   when: ceilometer_dev_mode | bool

ansible/roles/cinder/tasks/deploy.yml

@@ -3,10 +3,6 @@
   when: inventory_hostname in groups['cinder-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['cinder-api'] or
-        inventory_hostname in groups['cinder-volume'] or
-        inventory_hostname in groups['cinder-scheduler'] or
-        inventory_hostname in groups['cinder-backup']
 
 - include_tasks: clone.yml
   when: cinder_dev_mode | bool
@@ -18,7 +14,3 @@
   meta: flush_handlers
 
 - include_tasks: check.yml
-  when: inventory_hostname in groups['cinder-api'] or
-        inventory_hostname in groups['cinder-volume'] or
-        inventory_hostname in groups['cinder-scheduler'] or
-        inventory_hostname in groups['cinder-backup']

ansible/roles/cloudkitty/tasks/deploy.yml

@@ -3,8 +3,6 @@
   when: inventory_hostname in groups['cloudkitty-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['cloudkitty-api'] or
-        inventory_hostname in groups['cloudkitty-processor']
 
 - include_tasks: clone.yml
   when: cloudkitty_dev_mode | bool

ansible/roles/cyborg/tasks/deploy.yml

@@ -3,9 +3,6 @@
   when: inventory_hostname in groups['cyborg-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['cyborg-api'] or
-        inventory_hostname in groups['cyborg-conductor'] or
-        inventory_hostname in groups['cyborg-agent']
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['cyborg-api']

ansible/roles/designate/tasks/deploy.yml

@@ -3,13 +3,6 @@
   when: inventory_hostname in groups['designate-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['designate-api'] or
-        inventory_hostname in groups['designate-central'] or
-        inventory_hostname in groups['designate-producer'] or
-        inventory_hostname in groups['designate-mdns'] or
-        inventory_hostname in groups['designate-worker'] or
-        inventory_hostname in groups['designate-sink'] or
-        inventory_hostname in groups['designate-backend-bind9']
 
 - include_tasks: clone.yml
   when: designate_dev_mode | bool

ansible/roles/freezer/tasks/deploy.yml

@@ -3,8 +3,6 @@
   when: inventory_hostname in groups['freezer-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['freezer-api'] or
-        inventory_hostname in groups['freezer-scheduler']
 
 - include_tasks: clone.yml
   when: freezer_dev_mode | bool

ansible/roles/glance/tasks/deploy.yml

@@ -1,19 +1,15 @@
 ---
-- include_tasks: register.yml
-  when: inventory_hostname in groups['glance-api']
+- import_tasks: register.yml
 
 - include_tasks: config.yml
 
 - include_tasks: clone.yml
   when:
     - glance_dev_mode | bool
-    - inventory_hostname in groups['glance-api']
 
-- include_tasks: bootstrap.yml
-  when: inventory_hostname in groups['glance-api']
+- import_tasks: bootstrap.yml
 
 - name: Flush handlers
   meta: flush_handlers
 
 - include_tasks: check.yml
-  when: inventory_hostname in groups['glance-api']

ansible/roles/gnocchi/tasks/deploy.yml

@@ -3,9 +3,6 @@
   when: inventory_hostname in groups['gnocchi-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['gnocchi-statsd'] or
-        inventory_hostname in groups['gnocchi-api'] or
-        inventory_hostname in groups['gnocchi-metricd']
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['gnocchi-api']

ansible/roles/heat/tasks/deploy.yml

@@ -3,16 +3,10 @@
   when: inventory_hostname in groups['heat-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['heat-api'] or
-        inventory_hostname in groups['heat-api-cfn'] or
-        inventory_hostname in groups['heat-engine']
 
 - include_tasks: clone.yml
   when:
     - heat_dev_mode | bool
-    - inventory_hostname in groups['heat-api'] or
-      inventory_hostname in groups['heat-api-cfn'] or
-      inventory_hostname in groups['heat-engine']
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['heat-api']

ansible/roles/ironic/tasks/deploy.yml

@@ -7,11 +7,6 @@
 - include_tasks: config-host.yml
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['ironic-api'] or
-        inventory_hostname in groups['ironic-conductor'] or
-        inventory_hostname in groups['ironic-inspector'] or
-        inventory_hostname in groups['ironic-pxe'] or
-        inventory_hostname in groups['ironic-ipxe']
 
 - include_tasks: clone.yml
   when: ironic_dev_mode | bool

ansible/roles/karbor/tasks/deploy.yml

@@ -3,9 +3,6 @@
   when: inventory_hostname in groups['karbor-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['karbor-api'] or
-        inventory_hostname in groups['karbor-protection'] or
-        inventory_hostname in groups['karbor-operationengine']
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['karbor-api']

ansible/roles/magnum/tasks/deploy.yml

@@ -3,8 +3,6 @@
   when: inventory_hostname in groups['magnum-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['magnum-api'] or
-        inventory_hostname in groups['magnum-conductor']
 
 - include_tasks: clone.yml
   when: magnum_dev_mode | bool

ansible/roles/manila/tasks/deploy.yml

@@ -6,10 +6,6 @@
   when: inventory_hostname in groups['manila-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['manila-api'] or
-        inventory_hostname in groups['manila-data'] or
-        inventory_hostname in groups['manila-share'] or
-        inventory_hostname in groups['manila-scheduler']
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['manila-api']

ansible/roles/masakari/tasks/deploy.yml

@@ -3,9 +3,6 @@
   when: inventory_hostname in groups['masakari-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['masakari-api'] or
-        inventory_hostname in groups['masakari-engine'] or
-        inventory_hostname in groups['masakari-monitors']
 
 - include_tasks: clone.yml
   when: masakari_dev_mode | bool

ansible/roles/mistral/tasks/deploy.yml

@@ -3,10 +3,6 @@
   when: inventory_hostname in groups['mistral-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['mistral-api'] or
-        inventory_hostname in groups['mistral-engine'] or
-        inventory_hostname in groups['mistral-event-engne'] or
-        inventory_hostname in groups['mistral-executor']
 
 - include_tasks: clone.yml
   when: mistral_dev_mode | bool

ansible/roles/monasca/tasks/deploy.yml

@@ -4,15 +4,6 @@
         inventory_hostname in groups['monasca-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['monasca-agent'] or
-        inventory_hostname in groups['monasca-api'] or
-        inventory_hostname in groups['monasca-grafana'] or
-        inventory_hostname in groups['monasca-log-transformer'] or
-        inventory_hostname in groups['monasca-log-persister'] or
-        inventory_hostname in groups['monasca-log-metrics'] or
-        inventory_hostname in groups['monasca-thresh'] or
-        inventory_hostname in groups['monasca-notification'] or
-        inventory_hostname in groups['monasca-persister']
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['monasca-api'] or
@@ -22,14 +13,5 @@
   meta: flush_handlers
 
 - include_tasks: check.yml
-  when: inventory_hostname in groups['monasca-agent'] or
-        inventory_hostname in groups['monasca-api'] or
-        inventory_hostname in groups['monasca-grafana'] or
-        inventory_hostname in groups['monasca-log-transformer'] or
-        inventory_hostname in groups['monasca-log-persister'] or
-        inventory_hostname in groups['monasca-log-metrics'] or
-        inventory_hostname in groups['monasca-thresh'] or
-        inventory_hostname in groups['monasca-notification'] or
-        inventory_hostname in groups['monasca-persister']
 
 - include_tasks: post_config.yml

ansible/roles/murano/tasks/deploy.yml

@@ -3,14 +3,10 @@
   when: inventory_hostname in groups['murano-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['murano-api'] or
-        inventory_hostname in groups['murano-engine']
 
 - include_tasks: clone.yml
   when:
     - murano_dev_mode | bool
-    - inventory_hostname in groups['murano-api'] or
-      inventory_hostname in groups['murano-engine']
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['murano-api']

ansible/roles/octavia/tasks/deploy.yml

@@ -3,10 +3,6 @@
   when: inventory_hostname in groups['octavia-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['octavia-api'] or
-        inventory_hostname in groups['octavia-health-manager'] or
-        inventory_hostname in groups['octavia-housekeeping'] or
-        inventory_hostname in groups['octavia-worker']
 
 - include_tasks: clone.yml
   when: octavia_dev_mode | bool

ansible/roles/qinling/tasks/deploy.yml

@@ -3,8 +3,6 @@
   when: inventory_hostname in groups['qinling-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['qinling-api'] or
-        inventory_hostname in groups['qinling-engine']
 
 - include_tasks: clone.yml
   when: qinling_dev_mode | bool

ansible/roles/sahara/tasks/deploy.yml

@@ -3,8 +3,6 @@
   when: inventory_hostname in groups['sahara-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['sahara-api'] or
-        inventory_hostname in groups['sahara-engine']
 
 - include_tasks: clone.yml
   when: sahara_dev_mode | bool

ansible/roles/senlin/tasks/deploy.yml

@@ -3,10 +3,6 @@
   when: inventory_hostname in groups['senlin-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['senlin-api'] or
-        inventory_hostname in groups['senlin-conductor'] or
-        inventory_hostname in groups['senlin-engine'] or
-        inventory_hostname in groups['senlin-health-manager']
 
 - include_tasks: clone.yml
   when: senlin_dev_mode | bool

ansible/roles/skydive/tasks/deploy.yml

@@ -1,7 +1,5 @@
 ---
 - include_tasks: config.yml
-  when: inventory_hostname in groups['skydive-analyzer'] or
-        inventory_hostname in groups['skydive-agent']
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/solum/tasks/deploy.yml

@@ -3,10 +3,6 @@
   when: inventory_hostname in groups['solum-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['solum-api'] or
-        inventory_hostname in groups['solum-deploy'] or
-        inventory_hostname in groups['solum-worker'] or
-        inventory_hostname in groups['solum-conductor']
 
 - include_tasks: clone.yml
   when: solum_dev_mode | bool

ansible/roles/tacker/tasks/deploy.yml

@@ -3,14 +3,10 @@
   when: inventory_hostname in groups['tacker-server']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['tacker-server'] or
-        inventory_hostname in groups['tacker-conductor']
 
 - include_tasks: clone.yml
   when:
     - tacker_dev_mode | bool
-    - inventory_hostname in groups['tacker-server'] or
-      inventory_hostname in groups['tacker-conductor']
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['tacker-server']

ansible/roles/trove/tasks/deploy.yml

@@ -3,9 +3,6 @@
   when: inventory_hostname in groups['trove-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['trove-api'] or
-        inventory_hostname in groups['trove-conductor'] or
-        inventory_hostname in groups['trove-taskmanager']
 
 - include_tasks: clone.yml
   when: trove_dev_mode | bool

ansible/roles/vitrage/tasks/deploy.yml

@@ -3,11 +3,6 @@
   when: inventory_hostname in groups['vitrage-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['vitrage-api'] or
-        inventory_hostname in groups['vitrage-ml'] or
-        inventory_hostname in groups['vitrage-graph'] or
-        inventory_hostname in groups['vitrage-notifier'] or
-        inventory_hostname in groups['vitrage-persistor']
 
 - include_tasks: clone.yml
   when: vitrage_dev_mode | bool

ansible/roles/vmtp/tasks/deploy.yml

@@ -1,6 +1,5 @@
 ---
 - include_tasks: config.yml
-  when: inventory_hostname in groups['vmtp']
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/watcher/tasks/deploy.yml

@@ -3,9 +3,6 @@
   when: inventory_hostname in groups['watcher-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['watcher-api'] or
-        inventory_hostname in groups['watcher-engine'] or
-        inventory_hostname in groups['watcher-applier']
 
 - include_tasks: clone.yml
   when: watcher_dev_mode | bool

ansible/roles/zun/tasks/deploy.yml

@@ -3,9 +3,6 @@
   when: inventory_hostname in groups['zun-api']
 
 - include_tasks: config.yml
-  when: inventory_hostname in groups['zun-api'] or
-        inventory_hostname in groups['zun-compute'] or
-        inventory_hostname in groups['zun-cni-daemon']
 
 - include_tasks: clone.yml
   when: zun_dev_mode | bool