Merge "Fix k8s-calico DNS"
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-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-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 52e8c82..c926910 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -60,4 +60,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/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: