Merge "Correct cluster metadata for contrail-network-controller"
diff --git a/classes/cluster/k8s_ha_calico/infra/config.yml b/classes/cluster/k8s_ha_calico/infra/config.yml
index a31351f..1eb842b 100644
--- a/classes/cluster/k8s_ha_calico/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico/infra/config.yml
@@ -1,11 +1,10 @@
-alasses:
+classes:
- system.linux.system.repo.ubuntu
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.minion.ca.salt_master
- system.salt.master.api
- system.salt.minion.cert.k8s_server
-- system.mysql.client
- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
- cluster.k8s_ha_calico
diff --git a/classes/cluster/k8s_ha_calico/infra/init.yml b/classes/cluster/k8s_ha_calico/infra/init.yml
index d6bda6d..3220d0e 100644
--- a/classes/cluster/k8s_ha_calico/infra/init.yml
+++ b/classes/cluster/k8s_ha_calico/infra/init.yml
@@ -7,7 +7,6 @@
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
- system.openssh.server.team.k8s_team
-- system.rsyslog.client.single
parameters:
_param:
# infra service addresses
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/init.yml b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
index 7533873..c3c13a4 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/init.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
@@ -51,12 +51,6 @@
linux:
network:
- resolv:
- domain: virtual-mcp11-k8s-calico.local
- options:
- - ndots:5
- - timeout:2
- - attempts:2
host:
ctl:
address: ${_param:kubernetes_control_address}
diff --git a/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml b/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml
index 3e082b7..4cad082 100644
--- a/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml
@@ -32,8 +32,9 @@
pool:
network:
engine: opencontrail
- opencontrail:
- address: ${_param:opencontrail_control_address}
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/k8s_ha_contrail/kubernetes/control.yml b/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
index 6b84d95..2e8fd73 100644
--- a/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
@@ -44,5 +44,6 @@
public_ip_range: 185.22.97.128/26
public_network: default-domain:default-project:Public
private_ip_range: 10.150.0.0/16
- opencontrail:
- address: ${_param:opencontrail_control_address}
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
index 4bcf015..974906b 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
@@ -15,6 +15,7 @@
- system.glusterfs.client.volume.rundeck
- system.glusterfs.client.volume.salt_pki
- system.glusterfs.client.volume.security_monkey
+ - cluster.virtual-mcp-ocata-cicd.cicd.gluster
#- system.glusterfs.client.volume.salt
# Docker
- system.docker.host
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
index 5a1d1a3..082902e 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
@@ -12,4 +12,5 @@
- system.glusterfs.server.volume.pushkin
- system.glusterfs.server.volume.registry
- system.glusterfs.server.volume.rundeck
+ - system.glusterfs.server.volume.salt_pki
- system.glusterfs.server.volume.security_monkey
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
index 439ee4f..1d93eb1 100644
--- a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
@@ -13,6 +13,7 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.haproxy.proxy.listen.opencontrail.analytics
+- system.prometheus.exporters.jmx
- cluster.virtual-mcp11-contrail-nfv
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
index d657e0f..bcc9094 100644
--- a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
@@ -13,6 +13,7 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.haproxy.proxy.listen.opencontrail.analytics
+- system.prometheus.exporters.jmx
- cluster.virtual-mcp11-contrail
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
index 21675fb..864492b 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
@@ -27,7 +27,7 @@
resolv:
dns:
- 172.18.176.4
- - 172.18.176.7
+ - 172.18.208.44
host:
cfg01:
address: ${_param:infra_config_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
index 18d4302..79a552f 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
@@ -31,8 +31,6 @@
resolv:
dns:
- 10.254.0.10
- - 172.18.176.4
- - 172.18.176.7
interface:
ens4:
route:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
index a381b5e..626a99d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
@@ -24,8 +24,9 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
- kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
- kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
+ 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"
# switches of addons
kubernetes_helm_enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
index e102028..6124602 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
@@ -24,7 +24,7 @@
resolv:
dns:
- 172.18.176.4
- - 172.18.176.7
+ - 172.18.208.44
host:
cfg01:
address: ${_param:infra_config_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
index 1df5f06..7f42665 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
@@ -31,8 +31,6 @@
resolv:
dns:
- 10.254.0.10
- - 172.18.176.4
- - 172.18.176.7
interface:
ens4:
route:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
index b82b444..fa0bb5a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -43,3 +43,4 @@
enabled: ${_param:kubernetes_netchecker_enabled}
agent_image: ${_param:kubernetes_netchecker_agent_image}
server_image: ${_param:kubernetes_netchecker_server_image}
+ agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
index 61a6be8..06b33d5 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
@@ -23,8 +23,9 @@
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
- kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:latest
- kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server: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_probeurls: "http://ipinfo.io"
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
# addresses and hostnames
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index a5d2d26..a55f484 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -32,7 +32,7 @@
resolv:
dns:
- 172.18.176.4
- - 172.18.176.7
+ - 172.18.208.44
host:
cfg01:
address: ${_param:infra_config_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 77ed2f5..5263ff6 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -31,8 +31,6 @@
resolv:
dns:
- 10.254.0.10
- - 172.18.176.4
- - 172.18.176.7
interface:
ens4:
route:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 7f929d7..58860fa 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -24,8 +24,9 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
- kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
- kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
+ 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"
# switches of addons
kubernetes_helm_enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 63c1443..83a5a6e 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -66,6 +66,10 @@
prometheus_influxdb_db: lma
prometheus_influxdb_username: lma
prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ elasticsearch:
+ server:
+ heap:
+ size: 1
keepalived:
cluster:
instance:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index d9f03d1..728b82e 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -35,7 +35,7 @@
engine: opencontrail
config:
api:
- address: ${_param:opencontrail_control_address}
+ host: ${_param:opencontrail_control_address}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 11e23c4..00c9266 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -62,4 +62,4 @@
private_ip_range: 10.150.0.0/16
config:
api:
- address: ${_param:opencontrail_control_address}
+ host: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index ce0f8a5..5a5a26d 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -24,9 +24,11 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
- kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
- kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
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_probeurls: "http://ipinfo.io"
+ kubernetes_virtlet_image: mirantis/virtlet:v0.7.0
# switches of addons
kubernetes_helm_enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
index 0fdeb1d..35cead0 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
@@ -14,6 +14,7 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.haproxy.proxy.listen.opencontrail.analytics
+- system.prometheus.exporters.jmx
- cluster.virtual-mcp11-k8s-contrail.infra
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 761616f..a637712 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -66,6 +66,10 @@
prometheus_influxdb_db: lma
prometheus_influxdb_username: lma
prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ elasticsearch:
+ server:
+ heap:
+ size: 1
keepalived:
cluster:
instance: