Merge "Add Zun scenario job for ubuntu" into stable/queens

.zuul.yaml

@@ -14,7 +14,8 @@
         - kolla-ansible-ubuntu-source-ceph
         - kolla-ansible-centos-source-ceph
         - kolla-ansible-oraclelinux-source-ceph
-
+        - kolla-ansible-ubuntu-source-zun:
+            files: ^ansible\/roles\/zun\/.*
 - nodeset:
     name: kolla-ansible-centos
     nodes:
@@ -162,3 +163,13 @@
       base_distro: oraclelinux
       install_type: source
       scenario: ceph
+
+- job:
+    name: kolla-ansible-ubuntu-source-zun
+    parent: kolla-ansible-base
+    nodeset: kolla-ansible-xenial
+    voting: false
+    vars:
+      base_distro: ubuntu
+      install_type: source
+      scenario: zun

ansible/roles/zun/templates/zun.conf.j2

@@ -109,3 +109,4 @@ policy_file = {{ zun_policy_file }}
 
 [docker]
 docker_remote_api_version = 1.24
+api_url = tcp://{{ api_interface_address }}:2375

tests/templates/globals-default.j2

@@ -36,3 +36,9 @@ enable_cinder: "yes"
 ceph_pool_pg_num: 64
 ceph_pool_pgp_num: 64
 {% endif %}
+
+{% if scenario == "zun" %}
+enable_zun: "yes"
+enable_kuryr: "yes"
+docker_custom_option: " -H unix:///var/run/docker.sock -H tcp://{{ api_interface_address }}:2375"
+{% endif %}

tests/templates/inventory.j2

@@ -597,6 +597,9 @@ placement
 [zun-api:children]
 zun
 
+[zun-wsproxy:children]
+zun
+
 [zun-compute:children]
 compute
 

tools/setup_gate.sh

@@ -44,6 +44,10 @@ fi
     # Use the kolla-ansible tag rather than the kolla tag, since this is what
     # kolla-ansible will use by default.
     TAG=$(python -c "import pbr.version; print(pbr.version.VersionInfo('kolla-ansible'))")
+    if [[ $ACTION == "zun" ]]; then
+        GATE_IMAGES+=",zun,kuryr"
+    fi
+
     cat <<EOF | sudo tee /etc/kolla/kolla-build.conf
 [DEFAULT]
 include_header = /etc/kolla/header
@@ -91,6 +95,9 @@ function setup_ansible {
 
     # TODO(SamYaple): Move to virtualenv
     sudo -H pip install -U "ansible>=2,<2.4" "docker>=2.0.0" "python-openstackclient" "ara<0.16" "cmd2<0.9.0"
+    if [[ $ACTION == "zun" ]]; then
+        sudo -H pip install -U "python-zunclient"
+    fi
     detect_distro
 
     sudo mkdir /etc/ansible
@@ -139,6 +146,12 @@ function sanity_check {
         openstack volume create --size 2 test_volume
         openstack server add volume kolla_boot_test test_volume --device /dev/vdb
     fi
+    if echo $ACTION | grep -q "zun"; then
+        openstack --debug appcontainer service list
+        openstack --debug appcontainer host list
+        # TODO(hongbin): Run a Zun container and assert the container becomes
+        # Running
+    fi
 }
 
 check_failure() {