Adjust k8s network definition related to Contrail refactoring.
Change-Id: I0643175cc3a73e4fd2b1454a6659df65bfcba84e
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 11fd26c..f1b3f79 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -37,11 +37,11 @@
fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
engine: opencontrail
- config:
- api:
- host: ${_param:opencontrail_control_address}
- contrail_cni:
- image: ${_param:kubernetes_opencontrail_cni_image}
+ contrail:
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}
+ cni_image: ${_param:kubernetes_opencontrail_cni_image}
common:
addons:
virtlet:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 364879f..e1198a6 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -51,9 +51,10 @@
enabled: ${_param:kubernetes_netchecker_enabled}
network:
engine: opencontrail
- public_ip_range: 185.22.97.128/26
- public_network: default-domain:default-project:Public
- private_ip_range: 10.150.0.0/16
- config:
- api:
- host: ${_param:opencontrail_control_address}
+ contrail:
+ public_ip_range: 185.22.97.128/26
+ public_network: default-domain:default-project:Public
+ private_ip_range: 10.150.0.0/16
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}