| commit | 67f3d0b1d949b5ab291450a8669692112b8d87f3 | [log] [tgz] |
|---|---|---|
| author | Marek Celoud <mceloud@mirantis.com> | Fri Jul 07 09:43:09 2017 +0200 |
| committer | Tomas Kukral <tkukral@mirantis.com> | Mon Jul 10 14:48:48 2017 +0000 |
| tree | 3174e898603aca704ef50fc98540d31384608805 | |
| parent | 85c81de356dfdfbbe79f56e9659401ccfc81e0c3 [diff] |
unite opencontrail parameters Change-Id: I61feba921bfc1517df5019ed6a1bf0aa64d1d5e6
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-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}