Merge "Remove start.yml abstraction for kolla-ansible"

ansible/roles/common/defaults/main.yml

@@ -2,12 +2,6 @@
 ####################
 # Docker
 ####################
-docker_ansible_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
-docker_ansible_namespace: "{{ docker_namespace }}"
-kolla_ansible_base_distro: "{{ kolla_base_distro }}"
-kolla_ansible_install_type: "{{ kolla_install_type }}"
-kolla_ansible_container_name: "kolla-ansible"
-
-docker_ansible_image: "{{ docker_ansible_registry }}{{ docker_ansible_namespace }}/{{ kolla_ansible_base_distro }}-{{ kolla_ansible_install_type }}-{{ kolla_ansible_container_name }}"
-docker_ansible_tag: "{{ openstack_release }}"
-docker_ansible_image_full: "{{ docker_ansible_image }}:{{ docker_ansible_tag }}"
+ansible_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-ansible"
+ansible_tag: "{{ openstack_release }}"
+ansible_image_full: "{{ ansible_image }}:{{ ansible_tag }}"

ansible/roles/common/tasks/start.yml

@@ -1,9 +1,19 @@
 ---
-- include: ../../start.yml
-  vars:
-    container_command: "/bin/sleep infinity"
-    container_environment:
+- name: Starting Ansible container
+  docker:
+    docker_api_version: "{{ docker_api_version }}"
+    net: host
+    pull: "{{ docker_pull_policy }}"
+    restart_policy: "{{ docker_restart_policy }}"
+    restart_policy_retry: "{{ docker_restart_policy_retry }}"
+    state: reloaded
+    registry: "{{ docker_registry }}"
+    username: "{{ docker_registry_username }}"
+    password: "{{ docker_registry_password }}"
+    insecure_registry: "{{ docker_insecure_registry }}"
+    name: kolla_ansible
+    image: "{{ ansible_image_full }}"
+    env:
       ANSIBLE_NOCOLOR: "1"
       ANSIBLE_LIBRARY: "/usr/share/ansible"
-    container_image: "{{ docker_ansible_image_full }}"
-    container_name: "kolla_ansible"
+    command: "/bin/sleep infinity"