diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-17 12:20:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-17 12:20:24 +0000 |
| commit | 69902a264c8090447ea141044c6cf5747bf89317 (patch) | |
| tree | 7577085c6028ef33a0846f5dbae498ea187c52e4 /mcp | |
| parent | 49021c0d3853cf23690743fe3ff26d055ff3ee50 (diff) | |
| parent | 4010ea45c703d82e2fb95dcc869ff72bbca088b7 (diff) | |
Merge "[baremetal] MaaS: Remove curtin netconfig via Salt"
Diffstat (limited to 'mcp')
3 files changed, 7 insertions, 2 deletions
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 43d152023..b9db08a1a 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -13,8 +13,6 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" # KVM, compute node prereqs (libvirt first), VCP deployment -salt -C 'kvm* or cmp*' cmd.run 'rm -f /etc/network/interfaces.d/*.cfg' - # patch the networking module for Debian based distros debian_ip_source=/usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py salt -C 'kvm* or cmp*' file.line $debian_ip_source \ diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml index 004f72a41..7f2f57219 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml @@ -35,6 +35,10 @@ parameters: # {dhcp,single}_nic are not used, but referenced dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} single_nic: ${_param:opnfv_vcp_vm_secondary_interface} + linux: + network: + remove_iface_files: + - '/etc/network/interfaces.d/50-cloud-init.cfg' salt: control: size: # RAM 4096,8192,16384,32768,65536 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml index 30dda2f7f..a78850fc0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml @@ -47,6 +47,9 @@ 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: |