diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-08 15:16:34 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-13 17:39:45 +0100 |
| commit | 4010ea45c703d82e2fb95dcc869ff72bbca088b7 (patch) | |
| tree | 62c9a66789208c0f2a35cfb3943f91b1f06059aa /mcp/reclass/classes/cluster | |
| parent | 167e704d40bb40b1edf2e014444f0201a28178fa (diff) | |
[baremetal] MaaS: Remove curtin netconfig via Salt
JIRA: FUEL-301
Change-Id: Id6b2b423b8045c581fa5c02133cf91702d9915c9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml | 4 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml | 3 |
2 files changed, 7 insertions, 0 deletions
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 d098fa6df..8a37945cc 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 7d3dcb075..fd4c4cca1 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: |