Merge "fix interfaces for k8s and opencontrail"
diff --git a/classes/cluster/k8s_aio_contrail/infra/config.yml b/classes/cluster/k8s_aio_contrail/infra/config.yml
index faf7784..8f67033 100644
--- a/classes/cluster/k8s_aio_contrail/infra/config.yml
+++ b/classes/cluster/k8s_aio_contrail/infra/config.yml
@@ -19,6 +19,15 @@
linux_system_codename: xenial
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
salt_master_host: ${_param:infra_config_deploy_address}
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
reclass:
storage:
node:
diff --git a/classes/cluster/k8s_aio_contrail/infra/init.yml b/classes/cluster/k8s_aio_contrail/infra/init.yml
index 45e2e40..734adf9 100644
--- a/classes/cluster/k8s_aio_contrail/infra/init.yml
+++ b/classes/cluster/k8s_aio_contrail/infra/init.yml
@@ -26,13 +26,6 @@
names:
- ${_param:infra_config_hostname}
- ${_param:infra_config_hostname}.${_param:cluster_domain}
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
diff --git a/classes/cluster/k8s_aio_contrail/opencontrail/compute.yml b/classes/cluster/k8s_aio_contrail/opencontrail/compute.yml
index 912e753..d6f92b6 100644
--- a/classes/cluster/k8s_aio_contrail/opencontrail/compute.yml
+++ b/classes/cluster/k8s_aio_contrail/opencontrail/compute.yml
@@ -23,3 +23,8 @@
pool:
network:
hash: 2276df10feae8f09fb50dce3a96fff6c
+ linux:
+ network:
+ concat_iface_files:
+ - src: '/etc/network/interfaces.d/50-cloud-init.cfg'
+ dst: '/etc/network/interfaces'
\ No newline at end of file
diff --git a/classes/cluster/k8s_ha_contrail/infra/config.yml b/classes/cluster/k8s_ha_contrail/infra/config.yml
index 7a50368..30e09e7 100644
--- a/classes/cluster/k8s_ha_contrail/infra/config.yml
+++ b/classes/cluster/k8s_ha_contrail/infra/config.yml
@@ -24,6 +24,15 @@
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
reclass:
storage:
class_mapping:
diff --git a/classes/cluster/k8s_ha_contrail/infra/init.yml b/classes/cluster/k8s_ha_contrail/infra/init.yml
index 750d100..166a17b 100644
--- a/classes/cluster/k8s_ha_contrail/infra/init.yml
+++ b/classes/cluster/k8s_ha_contrail/infra/init.yml
@@ -20,13 +20,6 @@
names:
- ${_param:infra_config_hostname}
- ${_param:infra_config_hostname}.${_param:cluster_domain}
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
diff --git a/classes/cluster/k8s_ha_contrail/opencontrail/compute.yml b/classes/cluster/k8s_ha_contrail/opencontrail/compute.yml
index 912e753..d6f92b6 100644
--- a/classes/cluster/k8s_ha_contrail/opencontrail/compute.yml
+++ b/classes/cluster/k8s_ha_contrail/opencontrail/compute.yml
@@ -23,3 +23,8 @@
pool:
network:
hash: 2276df10feae8f09fb50dce3a96fff6c
+ linux:
+ network:
+ concat_iface_files:
+ - src: '/etc/network/interfaces.d/50-cloud-init.cfg'
+ dst: '/etc/network/interfaces'
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
index 4fd9100..b6e8f4a 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
@@ -19,6 +19,15 @@
linux_system_codename: xenial
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
salt_master_host: ${_param:infra_config_deploy_address}
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
reclass:
storage:
node:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 092165c..5ffacc2 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -36,13 +36,6 @@
names:
- ${_param:infra_config_hostname}
- ${_param:infra_config_hostname}.${_param:cluster_domain}
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml
index c928baa..712dc36 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml
@@ -24,3 +24,8 @@
pool:
network:
hash: ${_param:opencontrail_network_hash}
+ linux:
+ network:
+ concat_iface_files:
+ - src: '/etc/network/interfaces.d/50-cloud-init.cfg'
+ dst: '/etc/network/interfaces'
\ No newline at end of file