aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-02-07 07:51:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-07 07:51:24 +0000
commit22bbdf21851c3fdeb10579fc6b0e77a93e90e813 (patch)
tree283f48a3a85dafed7dce1f3f191ebc3e0b69ef7e
parent9a4d570364ae9126b7886bc187cc7f7e0f9ced7f (diff)
parenta13a1291399883be589e90a18f8598a3d0c21bc1 (diff)
Merge "[baremetal] cleanup: rm cloud-init iface config"
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml3
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml3
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: