commit 59641335f5c895a22ae8aa837cb7e00577e6db4c
author Andrey Shestakov <ashestakov@mirantis.com> Fri Nov 09 14:06:38 2018 +0200
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Wed Dec 12 00:19:37 2018 +0000
tree b5513f2d65c6ea7ed2ee7b75c7031d11a70ba0b7
parent 31f7fc8975cfb9055521d5dc6972bc9f951705db

Remove OC3 related definitions for k8s.

Related story: PROD-24611

Change-Id: Ic0327a5d27622ca8770629d44001b142fd990b02

kubernetes/common/init.yml

diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 76c1e9a..b76c1b6 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -6,8 +6,6 @@
     kubernetes_calico_birdcl_repo: ${_param:mcp_binary_registry}/mirantis/projectcalico/bird
     kubernetes_calico_cni_repo: ${_param:mcp_binary_registry}/mirantis/projectcalico/cni-plugin
     kubernetes_hyperkube_repo: ${_param:mcp_binary_registry}/mirantis/kubernetes/hyperkube-binaries
-    kubernetes_contrail_cni_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes
-    kubernetes_contrail_network_controller_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes/contrail-integration
     kubernetes_contrail_registry: ${_param:mcp_docker_registry}/opencontrail-${_param:linux_repo_contrail_component}
     kubernetes_netchecker_agent_repo: mirantis
     kubernetes_netchecker_server_repo: mirantis
@@ -40,8 +38,6 @@
     kubernetes_hyperkube_source: ${_param:kubernetes_hyperkube_repo}/hyperkube_v1.11.3-2_1536938897511
     kubernetes_hyperkube_source_hash: md5=159910d99c3ccf77d1e0f7b346edaf40
     kubernetes_pause_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/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.1
     kubernetes_criproxy_version: v0.12.0
     kubernetes_criproxy_checksum: md5=371cacd3d8568eb88425498b48a649dd
@@ -90,7 +86,6 @@
     kubernetes_genie_enabled: false
     kubernetes_calico_enabled: false
     kubernetes_opencontrail_enabled: false
-    kubernetes_contrail_network_controller_enabled: false
     kubernetes_metallb_enabled: false
     kubernetes_sriov_enabled: false
     kubernetes_telegraf_enabled: false
@@ -167,9 +162,6 @@
           image: ${_param:kubernetes_coredns_image}
           etcd:
             operator_image: ${_param:kubernetes_corends_etcd_operator_image}
-        contrail_network_controller:
-          enabled: ${_param:kubernetes_contrail_network_controller_enabled}
-          image: ${_param:kubernetes_contrail_network_controller_image}
         opencontrail:
           controller:
             image: ${_param:kubernetes_opencontrail_controller_image}
@@ -244,7 +236,6 @@
           cni_image: ${_param:kubernetes_calico_cni_image}
         opencontrail:
           enabled: ${_param:kubernetes_opencontrail_enabled}
-          cni_image: ${_param:kubernetes_contrail_cni_image}
         sriov:
           enabled: ${_param:kubernetes_sriov_enabled}
           source: ${_param:kubernetes_sriov_source}

kubernetes/master/common.yml

diff --git a/kubernetes/master/common.yml b/kubernetes/master/common.yml
index f649b4d..03c0f64 100644
--- a/kubernetes/master/common.yml
+++ b/kubernetes/master/common.yml
@@ -29,7 +29,6 @@
           cni_image: ${_param:kubernetes_calico_cni_image}
         opencontrail:
           enabled: ${_param:kubernetes_opencontrail_enabled}
-          cni_image: ${_param:kubernetes_contrail_cni_image}
         sriov:
           enabled: ${_param:kubernetes_sriov_enabled}
           source: ${_param:kubernetes_sriov_source}