Pull image from dockerhub rather than tarballs.o.o site

Change-Id: Id71c1ecda9f8647a0eb290fe02a12afb3df09988

4 files changed, 44 insertions, 0 deletions

diff --git a/tests/post.yml b/tests/post.yml
index 97a9cfaaa..a92cdcb3d 100644
--- a/tests/post.yml
+++ b/tests/post.yml
@@ -3,6 +3,11 @@
   vars:
     logs_dir: "/tmp/logs"
   tasks:
+    - name: Print all facts
+      copy:
+        content: "{{ hostvars[inventory_hostname] | to_nice_json }}"
+        dest: "{{ logs_dir }}/facts.json"
+
     - name: Run diagnostics script
       script: get_logs.sh
       register: get_logs_result
diff --git a/tests/run.yml b/tests/run.yml
index f1adf6982..abf5c5618 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -5,6 +5,7 @@
     logs_dir: "/tmp/logs"
     kolla_ansible_src_dir: "src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible"
     kolla_ansible_full_src_dir: "{{ zuul.executor.work_root }}/{{ kolla_ansible_src_dir }}"
+    need_build_image: false
   tasks:
     - name: ensure /etc/kolla exists
       file:
@@ -46,6 +47,13 @@
       with_items: "{{ ansible_interfaces }}"
       delegate_to: "primary"
 
+    - name: detect whether need build images
+      set_fact:
+        need_build_image: true
+      when:
+        - item.project.short_name == "kolla"
+      with_items: "{{ zuul['items'] }}"
+
     - name: generate global.yml file
       template:
         src: "{{ kolla_ansible_full_src_dir }}/tests/templates/globals-default.j2"
@@ -72,6 +80,22 @@
         dest: /etc/kolla/passwords.yml
       delegate_to: "primary"
 
+    - name: ensure /etc/docker exists
+      file:
+        path: "/etc/docker"
+        state: "directory"
+        mode: 0777
+      become: true
+
+    - name: create deamon.json for nodepool cache
+      vars:
+        infra_dockerhub_mirror: "http://{{ zuul_site_mirror_fqdn }}:8081/registry-1.docker/"
+      template:
+        src: "{{ kolla_ansible_full_src_dir }}/tests/templates/docker_daemon.json.j2"
+        dest: "/etc/docker/daemon.json"
+      become: true
+
+
     - name: install kolla-ansible requirements
       pip:
         requirements: "{{ ansible_env.HOME }}/{{ kolla_ansible_src_dir }}/requirements.txt"
@@ -89,6 +113,9 @@
           export INSTALL_TYPE={{ install_type }}
           export NODEPOOL_TARBALLS_MIRROR=http://{{ zuul_site_mirror_fqdn }}:8080/tarballs
 
+          export BUILD_IMAGE={{ need_build_image }}
+          export KOLLA_SRC_DIR={{ ansible_env.HOME }}/src/git.openstack.org/openstack/kolla
+
           tools/setup_gate.sh
         executable: /bin/bash
         chdir: "{{ kolla_ansible_src_dir }}"
diff --git a/tests/templates/docker_daemon.json.j2 b/tests/templates/docker_daemon.json.j2
new file mode 100644
index 000000000..b35d7589b
--- /dev/null
+++ b/tests/templates/docker_daemon.json.j2
@@ -0,0 +1,6 @@
+{
+  "debug": true,
+  "registry-mirrors": [
+    "{{ infra_dockerhub_mirror }}"
+  ]
+}
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 4404f9875..8020aefcf 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -11,9 +11,15 @@ kolla_internal_vip_address: "169.254.169.10"
 
 network_interface: "{{ api_interface_name }}"
 docker_restart_policy: "never"
+{% if need_build_image %}
 # NOTE(Jeffrey4l): use different a docker namespace name in case it pull image from hub.docker.io when deplying
 docker_namespace: "lokolla"
 docker_registry: "{{ api_interface_address }}:4000"
+{% else %}
+# use docker hub images
+docker_namespace: "kolla"
+openstack_release: "queens"
+{% endif %}
 neutron_external_interface: "fake_interface"
 enable_horizon: "yes"
 enable_heat: "no"