commit 55e9660038622e550998e98824081e1ee4a68829
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Oct 05 14:03:41 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Oct 05 14:03:41 2018 +0000
tree cc2184a1877f93f7b9d160af1ff31104a5228495
parent a6a84e92aca7f98c7d28fc9c4967528474962374
parent 41ca93855353dc0afc537385afc29f242580feca

Merge "Update/clean up users in networking team"

jenkins/client/job/deploy/lab/deploy.yml

diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index f5d34f6..1914ec5 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -173,7 +173,7 @@
                 default: "http://127.0.0.1:8080"
               TEST_K8S_CONFORMANCE_IMAGE:
                 type: string
-                default: "docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.10.4-4"
+                default: "docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.11.3-2"
 
               TEST_TEMPEST_IMAGE:
                 type: string

kubernetes/common/init.yml

diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index d5e145e..f7b77db 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -33,7 +33,7 @@
     kubernetes_pause_image: ${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.11.3-2
     kubernetes_contrail_cni_image: ${_param:kubernetes_contrail_cni_repo}/contrail-cni:v1.2.0
     kubernetes_contrail_network_controller_image: ${_param:kubernetes_contrail_network_controller_repo}/contrail-network-controller:v1.2.0
-    kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.4.0
+    kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.4.1
     kubernetes_criproxy_version: v0.12.0
     kubernetes_criproxy_checksum: md5=371cacd3d8568eb88425498b48a649dd
     kubernetes_netchecker_agent_image: ${_param:kubernetes_netchecker_agent_repo}/k8s-netchecker-agent:v1.2.2

nginx/server/proxy/openstack/glance.yml

diff --git a/nginx/server/proxy/openstack/glance.yml b/nginx/server/proxy/openstack/glance.yml
index 3479296..9cdd702 100644
--- a/nginx/server/proxy/openstack/glance.yml
+++ b/nginx/server/proxy/openstack/glance.yml
@@ -3,6 +3,7 @@
     nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
     nginx_proxy_openstack_glance_protocol: 'http'
     nginx_proxy_openstack_glance_host: ${_param:glance_service_host}
+    nginx_proxy_openstack_glance_image_size: '30000m'
     nginx_proxy_openstack_api_address: 0.0.0.0
   nginx:
     server:
@@ -18,7 +19,7 @@
             host: ${_param:nginx_proxy_openstack_glance_host}
             port: 9292
             protocol: ${_param:nginx_proxy_openstack_glance_protocol}
-            size: 30000m
+            size:  ${_param:nginx_proxy_openstack_glance_image_size}
           host:
             name: ${_param:nginx_proxy_openstack_api_host}
             port: 9292