diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-29 14:22:00 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-07 01:13:11 +0100 |
| commit | a13a1291399883be589e90a18f8598a3d0c21bc1 (patch) | |
| tree | 5eee3a4d2d78960448c36245dae2fe40a23de6db /mcp | |
| parent | 6357d861c2f7c69c1486a40a81d24d7dda66eba8 (diff) | |
[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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 3 |
2 files changed, 0 insertions, 6 deletions
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: |