[baremetal] cleanup: rm cloud-init iface config 59/49759/2
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 29 Dec 2017 13:22:00 +0000 (14:22 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 7 Feb 2018 00:13:11 +0000 (01:13 +0100)
Upstream commit [1] now handles cloud init interface configuration
cleanup, so drop our explicit config from reclass.

[1] https://github.com/salt-formulas/salt-formula-linux/commit/b333d284

Change-Id: Ifd624f1e884d0d884513a3a7c3e18ffe3f00949a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml

index a933adf..9f85366 100644 (file)
@@ -34,9 +34,6 @@ parameters:
     keepalived_vip_interface: br-ctl
     keepalived_vip_virtual_router_id: 69
   linux:
-    network:
-      remove_iface_files:
-        - '/etc/network/interfaces.d/50-cloud-init.cfg'
     system:
       kernel:
         boot_options:
index f2cf257..7f81d7a 100644 (file)
@@ -45,9 +45,6 @@ parameters:
           # yamllint disable-line rule:line-length
           opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
   linux:
-    network:
-      remove_iface_files:
-        - '/etc/network/interfaces.d/50-cloud-init.cfg'
     system:
       kernel:
         sysctl: