Merge "Adding container engine to kolla_container_facts"

ansible/library/kolla_container_facts.py

@@ -27,6 +27,11 @@ description:
   - A module targeting at collecting Docker container facts. It is used for
     detecting whether the container is running on host in Kolla.
 options:
+  container_engine:
+    description:
+      - Name of container engine to use
+    required: True
+    type: str
   api_version:
     description:
       - The version of the api for docker-py to use when contacting docker
@@ -49,6 +54,7 @@ EXAMPLES = '''
 
     - name: Gather glance container facts
       kolla_container_facts:
+        container_engine: docker
         name:
           - glance_api
           - glance_registry
@@ -62,7 +68,8 @@ def get_docker_client():
 def main():
     argument_spec = dict(
         name=dict(required=False, type='list', default=[]),
-        api_version=dict(required=False, type='str', default='auto')
+        api_version=dict(required=False, type='str', default='auto'),
+        container_engine=dict(required=True, type='str')
     )
 
     module = AnsibleModule(argument_spec=argument_spec)

ansible/roles/aodh/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - aodh_api
   register: container_facts

ansible/roles/barbican/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - barbican_api
   register: container_facts

ansible/roles/bifrost/tasks/stop.yml

@@ -3,6 +3,7 @@
     - name: Check if bifrost_deploy container is running
       become: true
       kolla_container_facts:
+        container_engine: "{{ kolla_container_engine }}"
         name:
           - bifrost_deploy
       register: container_facts

ansible/roles/blazar/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - blazar_api
   register: container_facts

ansible/roles/cinder/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - cinder_api
   register: container_facts

ansible/roles/cloudkitty/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - cloudkitty_api
   register: container_facts

ansible/roles/cyborg/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - cyborg_api
   register: container_facts

ansible/roles/designate/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - designate_api
       - designate_backend_bind9

ansible/roles/elasticsearch/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - elasticsearch
   register: container_facts

ansible/roles/etcd/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - etcd
   register: container_facts

ansible/roles/freezer/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - freezer_api
   register: container_facts

ansible/roles/glance/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name: "{{ glance_services.values() | map(attribute='container_name') | list }}"
   register: container_facts
 

ansible/roles/gnocchi/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - gnocchi_api
   register: container_facts

ansible/roles/grafana/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - grafana
   register: container_facts

ansible/roles/hacluster/tasks/precheck.yml

@@ -2,6 +2,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - hacluster_pacemaker_remote
   register: container_facts

ansible/roles/heat/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - heat_api
       - heat_api_cfn

ansible/roles/horizon/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - horizon
   register: container_facts

ansible/roles/influxdb/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - influxdb
   register: container_facts

ansible/roles/ironic/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - ironic_api
       - ironic_inspector

ansible/roles/iscsi/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - iscsid
   register: container_facts

ansible/roles/kafka/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - kafka
   register: container_facts

ansible/roles/keystone/tasks/bootstrap_service.yml

@@ -2,6 +2,7 @@
 - name: Checking for any running keystone_fernet containers
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - keystone_fernet
   register: container_facts

ansible/roles/keystone/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - keystone
       - keystone_ssh

ansible/roles/kibana/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - kibana
   register: container_facts

ansible/roles/kuryr/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - kuryr
   register: container_facts

ansible/roles/loadbalancer/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - haproxy
       - proxysql

ansible/roles/magnum/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - magnum_api
   register: container_facts

ansible/roles/manila/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - manila_api
   register: container_facts

ansible/roles/mariadb/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - mariadb
   register: container_facts

ansible/roles/masakari/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - masakari_api
   register: container_facts

ansible/roles/memcached/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - memcached
   register: container_facts

ansible/roles/mistral/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - mistral_api
   register: container_facts

ansible/roles/monasca/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name: "{{ monasca_services.values() | map(attribute='container_name') | list }}"
   register: container_facts
 

ansible/roles/murano/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - murano_api
   register: container_facts

ansible/roles/neutron/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - neutron_server
   register: container_facts

ansible/roles/nova-cell/tasks/libvirt-cleanup.yml

@@ -9,6 +9,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - nova_libvirt
   register: container_facts

ansible/roles/nova-cell/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - nova_libvirt
       - nova_novncproxy

ansible/roles/nova/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - nova_api
   register: container_facts

ansible/roles/octavia/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - octavia_api
       - octavia_health_manager

ansible/roles/openvswitch/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - openvswitch_db
   register: container_facts

ansible/roles/ovn/tasks/precheck.yml

@@ -2,6 +2,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - ovn_nb_db
       - ovn_sb_db

ansible/roles/placement/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - placement_api
   register: container_facts

ansible/roles/prometheus/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - prometheus_server
       - prometheus_node_exporter

ansible/roles/rabbitmq/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - rabbitmq
       - outward_rabbitmq

ansible/roles/redis/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - redis
   register: container_facts

ansible/roles/sahara/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - sahara_api
   register: container_facts

ansible/roles/senlin/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - senlin_api
   register: container_facts

ansible/roles/skydive/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - skydive_analyzer
       - skydive_agent

ansible/roles/solum/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - solum_api
   register: container_facts

ansible/roles/storm/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - storm_worker
       - storm_nimbus

ansible/roles/swift/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - swift_account_server
       - swift_container_server

ansible/roles/tacker/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - tacker_server
   register: container_facts

ansible/roles/trove/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - trove_api
   register: container_facts

ansible/roles/venus/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - venus_api
   register: container_facts

ansible/roles/vitrage/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - vitrage_api
   register: container_facts

ansible/roles/watcher/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - watcher_api
   register: container_facts

ansible/roles/zookeeper/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - zookeeper
   register: container_facts

ansible/roles/zun/tasks/precheck.yml

@@ -8,6 +8,7 @@
 - name: Get container facts
   become: true
   kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
     name:
       - zun_api
       - zun_wsproxy