Fix of K8s+OC4.0 virtual lab
Change-Id: If0f7735a2e22648cf44cc795fef11dc2730dab9d
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
index b1750ee..8aa48ea 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
@@ -39,6 +39,8 @@
kubelet:
address: ${_param:single_address}
fail_on_swap: ${_param:kubelet_fail_on_swap}
+ kube_proxy:
+ enabled: false
network:
opencontrail:
enabled: true
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index b9388c8..c556728 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -24,14 +24,14 @@
type: eth
mtu: 1500
proto: dhcp
-
ens4:
enabled: true
type: eth
mtu: 1500
- address: ${_param:single_address}
netmask: '255.255.255.0'
- ipflush_onchange: true
+ address: ${_param:single_address}
+ pre_up_cmds:
+ - ip addr flush dev ens4
etcd:
server:
bind:
@@ -49,6 +49,8 @@
engine: none
opencontrail:
enabled: false
+ kube_proxy:
+ enabled: false
common:
addons:
dashboard:
@@ -96,9 +98,9 @@
private_ip_range: 10.150.0.0/16
network_manager:
image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-kube-manager
-# config:
-# api:
-# host: ${_param:opencontrail_control_address}
+ config:
+ api:
+ host: ${_param:keepalived_vip_address}
identity:
auth_user: admin
auth_password: contrail123