Merge "Add Zun scenario job for ubuntu"

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

@@ -113,3 +113,4 @@ base_url = ws://{{ kolla_external_fqdn }}:{{ zun_wsproxy_port }}
 
 [docker]
 docker_remote_api_version = 1.24
+api_url = tcp://{{ api_interface_address }}:2375

tests/templates/globals-default.j2

@@ -44,4 +44,10 @@ ceph_pool_pg_num: 8
 ceph_pool_pgp_num: 8
 {% 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 %}
+
 keystone_token_provider: "fernet"

tools/setup_gate.sh

@@ -44,6 +44,10 @@ EOF
         GATE_IMAGES+=",ceph,cinder"
     fi
 
+    if [[ $ACTION == "zun" ]]; then
+        GATE_IMAGES+=",zun,kuryr"
+    fi
+
     cat <<EOF | sudo tee /etc/kolla/kolla-build.conf
 [DEFAULT]
 include_header = /etc/kolla/header
@@ -87,6 +91,9 @@ function setup_ansible {
 
     # TODO(SamYaple): Move to virtualenv
     sudo -H pip install -U "ansible>=2.4" "docker>=2.0.0" "python-openstackclient" "ara" "cmd2<0.9.0"
+    if [[ $ACTION == "zun" ]]; then
+        sudo -H pip install -U "python-zunclient"
+    fi
     detect_distro
 
     sudo mkdir /etc/ansible
@@ -135,6 +142,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
 }
 
 function test_openstack {

zuul.d/jobs.yaml

@@ -88,3 +88,13 @@
     voting: false
     vars:
       base_distro: centos
+
+- 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

zuul.d/project.yaml

@@ -18,6 +18,8 @@
         - kolla-ansible-oraclelinux-source-ceph
         - kolla-ansible-bifrost-centos-source:
             files: ^ansible\/roles\/bifrost\/.*
+        - kolla-ansible-ubuntu-source-zun:
+            files: ^ansible\/roles\/zun\/.*
         - openstack-tox-lower-constraints
     gate:
       jobs: