commit 9749b27f0285da49b286c6dce850696b1ba40917
author Marek Celoud <mceloud@mirantis.com> Mon Jul 10 17:47:42 2017 +0200
committer Marek Celoud <mceloud@mirantis.com> Mon Jul 10 17:47:42 2017 +0200
tree 30c61d2d1aadd25950681c386d819bc39eb931c2
parent 67f3d0b1d949b5ab291450a8669692112b8d87f3

fix interfaces for k8s and opencontrail

Change-Id: I70129e5f5e4da214ab2df82fca0a6e9140bf459e

classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml

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:

classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml

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}

classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml

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