Merge "Convert Ironic to kolla_docker"

2 files changed, 34 insertions, 95 deletions

diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml
index 94f7b572f..d33859fae 100644
--- a/ansible/roles/ironic/tasks/bootstrap.yml
+++ b/ansible/roles/ironic/tasks/bootstrap.yml
@@ -37,39 +37,18 @@
   run_once: True
   delegate_to: "{{ groups['ironic-api'][0] }}"
 
-- name: Starting Ironic bootstrap container
-  docker:
-    tty: True
+- name: Running Ironic bootstrap container
+  kolla_docker:
+    action: "start_container"
+    common_options: "{{ docker_common_options }}"
     detach: False
-    net: host
-    pull: "{{ docker_pull_policy }}"
-    restart_policy: "no"
-    state: reloaded
-    registry: "{{ docker_registry }}"
-    username: "{{ docker_registry_username }}"
-    password: "{{ docker_registry_password }}"
-    insecure_registry: "{{ docker_insecure_registry }}"
-    name: bootstrap_ironic
-    image: "{{ ironic_api_image_full }}"
-    volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro"
-    env:
+    environment:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-  run_once: True
-  delegate_to: "{{ groups['ironic-api'][0] }}"
-  when: database_created
-
-# https://github.com/ansible/ansible-modules-core/pull/1031
-- name: Waiting for Ironic bootstrap container to exit
-  command: docker wait bootstrap_ironic
-  run_once: True
-  delegate_to: "{{ groups['ironic-api'][0] }}"
-  when: database_created
-
-- name: Cleaning up boostrap container
-  docker:
-    name: bootstrap_ironic
     image: "{{ ironic_api_image_full }}"
-    state: absent
+    name: "bootstrap_ironic"
+    restart_policy: "never"
+    volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro"
+  run_once: True
   delegate_to: "{{ groups['ironic-api'][0] }}"
   when: database_created
diff --git a/ansible/roles/ironic/tasks/start.yml b/ansible/roles/ironic/tasks/start.yml
index 2f7043e97..202d1b841 100644
--- a/ansible/roles/ironic/tasks/start.yml
+++ b/ansible/roles/ironic/tasks/start.yml
@@ -1,81 +1,41 @@
 ---
-- name: Starting Ironic-pxe container
-  docker:
-    tty: True
-    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: ironic-pxe
+- name: Starting ironic-pxe container
+  kolla_docker:
+    action: "start_container"
+    common_options: "{{ docker_common_options }}"
+    name: "ironic-pxe"
     image: "{{ ironic_pxe_image_full }}"
     volumes:
       - "{{ node_config_directory }}/ironic-pxe/:{{ container_config_directory }}/:ro"
-      - "/tftpboot/"
-    env:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+      - "ironic-pxe:/tftpboot/"
   when: inventory_hostname in groups['ironic-pxe']
 
-- name: Starting Ironic-api container
-  docker:
-    tty: True
-    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: ironic-api
+- name: Starting ironic-api container
+  kolla_docker:
+    action: "start_container"
+    common_options: "{{ docker_common_options }}"
     image: "{{ ironic_api_image_full }}"
+    name: "ironic-api"
     volumes: "{{ node_config_directory }}/ironic-api/:{{ container_config_directory }}/:ro"
-    env:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['ironic-api']
 
-- name: Starting Ironic-conductor container
-  docker:
-    tty: True
-    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: ironic-conductor
+- name: Starting ironic-conductor container
+  kolla_docker:
+    action: "start_container"
+    common_options: "{{ docker_common_options }}"
     image: "{{ ironic_conductor_image_full }}"
-    volumes: "{{ node_config_directory }}/ironic-conductor/:{{ container_config_directory }}/:ro"
-    volumes_from:
-      - ironic-pxe
-    env:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+    name: "ironic-conductor"
+    volumes:
+      - "{{ node_config_directory }}/ironic-conductor/:{{ container_config_directory }}/:ro"
+      - "ironic-pxe:/tftpboot/"
   when: inventory_hostname in groups['ironic-conductor']
 
-- name: Starting Ironic-discoverd container
-  docker:
-    tty: True
-    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 }}"
-    privileged: True
-    name: ironic-discoverd
+- name: Starting ironic-discoverd container
+  kolla_docker:
+    action: "start_container"
+    common_options: "{{ docker_common_options }}"
     image: "{{ ironic_discoverd_image_full }}"
+    name: "ironic-discoverd"
+    privileged: True
     volumes: "{{ node_config_directory }}/ironic-discoverd/:{{ container_config_directory }}/:ro"
-    env:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['ironic-discoverd']