From a13a1291399883be589e90a18f8598a3d0c21bc1 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 29 Dec 2017 14:22:00 +0100 Subject: [baremetal] cleanup: rm cloud-init iface config 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 --- mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 3 --- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 3 --- 2 files changed, 6 deletions(-) (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha') diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml index a933adf48..9f85366c8 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml @@ -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: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml index f2cf257eb..7f81d7a72 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml @@ -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: -- cgit 1.2.3-korg