Split deploy steps in separate playbooks: part1 (#3451)

* Fix bootstrap_os/ubuntu idempotency

* Update bastion role

* move container_engine in sub-roles

* requires ansible 2.5

* ubuntu18 as first CI job

roles/docker/meta/main.yml → roles/container-engine/docker/meta/main.yml

 ---
 dependencies:
-  - role: docker/docker-storage
+  - role: container-engine/docker/docker-storage
     when: docker_container_storage_setup and ansible_os_family == "RedHat"

roles/docker/tasks/main.yml → roles/container-engine/docker/tasks/main.yml

 ---
+- name: check if atomic host
+  stat:
+    path: /run/ostree-booted
+  register: ostree
+
+- set_fact:
+    is_atomic: "{{ ostree.stat.exists }}"
+
 - name: gather os specific variables
   include_vars: "{{ item }}"
   with_first_found:
@@ -52,7 +60,7 @@
   register: keyserver_task_result
   until: keyserver_task_result|succeeded
   retries: 4
-  delay: "{{ retry_stagger | random + 3 }}"
+  delay: "{{ retry_stagger | d(3) }}"
   with_items: "{{ docker_repo_key_info.repo_keys }}"
   when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS", "RedHat", "Suse"] or is_atomic)
 
@@ -73,7 +81,7 @@
   register: keyserver_task_result
   until: keyserver_task_result|succeeded
   retries: 4
-  delay: "{{ retry_stagger | random + 3 }}"
+  delay: "{{ retry_stagger | d(3) }}"
   with_items: "{{ dockerproject_repo_key_info.repo_keys }}"
   when:
     - not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS", "RedHat", "Suse"] or is_atomic)
@@ -128,7 +136,7 @@
   register: docker_task_result
   until: docker_task_result|succeeded
   retries: 4
-  delay: "{{ retry_stagger | random + 3 }}"
+  delay: "{{ retry_stagger | d(3) }}"
   with_items: "{{ docker_package_info.pkgs }}"
   notify: restart docker
   when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] or is_atomic) and (docker_package_info.pkgs|length > 0)

roles/docker/tasks/set_facts_dns.yml → roles/container-engine/docker/tasks/set_facts_dns.yml

@@ -2,16 +2,11 @@
 
 - name: set dns server for docker
   set_fact:
-    docker_dns_servers: |-
-      {%- if dns_mode in ['kubedns', 'coredns'] -%}
-        {{ [ skydns_server ] }}
-      {%- elif dns_mode == 'coredns_dual' -%}
-        {{ [ skydns_server ] + [ skydns_server_secondary ] }}
-      {%- elif dns_mode == 'dnsmasq_kubedns' -%}
-        {{ [ dnsmasq_dns_server ] }}
-      {%- elif dns_mode == 'manual' -%}
-        {{ [ manual_dns_server ] }}
-      {%- endif -%}
+    docker_dns_servers: "{{dns_servers}}"
+
+- name: show docker_dns_servers
+  debug:
+    msg: "{{docker_dns_servers}}"
 
 - name: set base docker dns facts
   set_fact:
@@ -23,6 +18,7 @@
       - timeout:2
       - attempts:2
 
+
 - name: add upstream dns servers (only when dnsmasq is not used)
   set_fact:
     docker_dns_servers: "{{ docker_dns_servers + upstream_dns_servers|default([]) }}"