Fix net for contrail.
* Moved keepalived from ens3 to vhost0.
* Moved haproxy for k8s to vhost0.
* Changed netchecker images versions to stable label.
Change-Id: Iacfc379e405660bba075cc713cd4183717864025
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index 1e9913f..10d54c9 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -34,6 +34,8 @@
bip: 172.31.255.1/24
kubernetes:
pool:
+ kubelet:
+ address: ${_param:single_address}
network:
engine: opencontrail
config:
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index f086fd7..6ce6d67 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -8,7 +8,7 @@
- cluster.k8s-ha-contrail
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: vhost0
keepalived_vip_virtual_router_id: 60
etcd:
server:
@@ -44,6 +44,8 @@
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
master:
+ kubelet:
+ address: ${_param:single_address}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index ad6ac37..d84f867 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -26,8 +26,8 @@
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.5-2
kubernetes_virtlet_image: mirantis/virtlet:latest
- kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
- kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
+ kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
+ kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
kubernetes_virtlet_image: mirantis/virtlet:v0.7.0
kubernetes_externaldns_image: mirantis/external-dns:latest
@@ -47,7 +47,7 @@
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
kubernetes_control_hostname: ctl
- kubernetes_control_address: 192.168.10.253
+ kubernetes_control_address: 172.16.10.253
kubernetes_control_node01_hostname: ctl01
kubernetes_control_node02_hostname: ctl02
kubernetes_control_node03_hostname: ctl03