Merge "fix interfaces for k8s and opencontrail"
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-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/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/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/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index c926910..00c9266 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -51,8 +51,10 @@
- ${_param:kubernetes_compute_node01_hostname}
- ${_param:kubernetes_compute_node02_hostname}
image: ${_param:kubernetes_virtlet_image}
- kube_network_manager:
- enabled: ${_param:kubernetes_kube_network_manager_enabled}
+ contrail_network_controller:
+ namespace: kube-system
+ enabled: true
+ image: ${_param:kubernetes_contrail_network_controller_image}
network:
engine: opencontrail
public_ip_range: 185.22.97.128/26
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index dbed35d..5a5a26d 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -35,7 +35,6 @@
kubernetes_netchecker_enabled: true
kubernetes_calico_policy_enabled: false
kubernetes_virtlet_enabled: false
- kubernetes_kube_network_manager_enabled: true
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
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: