Update virtual-mcp11-k8s-contrail
- Updated k8s part
- Minor updates for contrail part
Change-Id: Iad8cd491dcb33bd1fc03d05389ed0d3a848ef600
Related-PROD: PROD-18983
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index adfdfff..33bf3dd 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -2,7 +2,6 @@
parameters:
_param:
openstack_version: pike
-
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
@@ -27,27 +26,36 @@
kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
- 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_probeurls: "http://ipinfo.io"
- kubernetes_externaldns_image: mirantis/external-dns:latest
- kubernetes_externaldns_provider: coredns
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
+ kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+ kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
+ kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
+ kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
+ kubernetes_dns_autoscaler_image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.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.9.4
+ kubernetes_externaldns_image: mirantis/external-dns:latest
+ kubernetes_externaldns_provider: coredns
# switches of addons
+ kubernetes_addon_namespace: kube-system
+ kubernetes_dns: true
+ kubernetes_dashboard: false
kubernetes_helm_enabled: true
kubernetes_netchecker_enabled: true
kubernetes_calico_policy_enabled: false
kubernetes_virtlet_enabled: false
- kubernetes_virtlet_image: mirantis/virtlet:latest
+ kubernetes_contrail_network_controller: true
kubernetes_coredns_enabled: false
kubernetes_externaldns_enabled: false
# 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
@@ -56,28 +64,32 @@
kubernetes_control_node01_address: 172.16.10.101
kubernetes_control_node02_address: 172.16.10.102
kubernetes_control_node03_address: 172.16.10.103
+ kubernetes_control_node01_deploy_address: 192.168.10.101
+ kubernetes_control_node02_deploy_address: 192.168.10.102
+ kubernetes_control_node03_deploy_address: 192.168.10.103
kubernetes_compute_node01_address: 172.16.10.105
kubernetes_compute_node02_address: 172.16.10.106
+ etcd_control_node01_address: 192.168.10.101
+ etcd_control_node02_address: 192.168.10.102
+ etcd_control_node03_address: 192.168.10.103
kubernetes_proxy_node01_hostname: prx01
kubernetes_proxy_node01_address: 172.16.10.121
cluster_vip_address: ${_param:kubernetes_control_address}
- cluster_local_address: ${_param:single_address}
# etcd stuff
cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
- cluster_node01_address: ${_param:kubernetes_control_node01_address}
+ cluster_node01_address: ${_param:etcd_control_node01_address}
cluster_node01_port: 4001
cluster_node02_hostname: ${_param:kubernetes_control_node02_hostname}
- cluster_node02_address: ${_param:kubernetes_control_node02_address}
+ cluster_node02_address: ${_param:etcd_control_node02_address}
cluster_node02_port: 4001
cluster_node03_hostname: ${_param:kubernetes_control_node03_hostname}
- cluster_node03_address: ${_param:kubernetes_control_node03_address}
+ cluster_node03_address: ${_param:etcd_control_node03_address}
cluster_node03_port: 4001
linux:
network:
- purge_hosts: true
host:
ctl:
address: ${_param:kubernetes_control_address}