diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-11 17:08:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-11 17:08:54 +0000 |
| commit | c2269d2ed4f55ec051c058dc6b733f74d0d3eec3 (patch) | |
| tree | e0feffad9efc149dd1382988a5267f43c83293bd /mcp/reclass/classes/cluster/virtual-mcp-ocata-common | |
| parent | 89bb73f0fba7d09591f52f5a513d1a846c373a8b (diff) | |
| parent | 0546e310ce230a46dcf3a3795c6a0baefd7aaaf2 (diff) | |
Merge changes from topic 'multiarch-image-defaults'
* changes:
reclass: virtual: Factor out VM interface naming
reclass: Multiarch support for arch specific param
Diffstat (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-common')
4 files changed, 14 insertions, 11 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml index a5fc3b1d3..d60c81dd1 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml @@ -25,8 +25,9 @@ parameters: linux: network: interface: - ens4: + single_int: enabled: true + name: ${_param:opnfv_fn_vm_secondary_interface} type: eth proto: static address: ${_param:single_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml index 0cb7ccb01..2485d1ff2 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml @@ -12,9 +12,9 @@ classes: - system.ceilometer.client.cinder_volume parameters: _param: - primary_interface: ens4 - tenant_interface: ens5 - external_interface: ens6 + primary_interface: ${_param:opnfv_fn_vm_secondary_interface} + tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface} + external_interface: ${_param:opnfv_fn_vm_quaternary_interface} interface_mtu: 9000 linux_system_codename: xenial loopback_device_size: 10 @@ -50,7 +50,7 @@ parameters: interface: dhcp_int: enabled: true - name: ens3 + name: ${_param:opnfv_fn_vm_primary_interface} proto: dhcp type: eth mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml index 0927900cb..5b68b7b62 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml @@ -48,14 +48,16 @@ parameters: version: latest network: interface: - ens4: + single_int: enabled: true + name: ${_param:opnfv_fn_vm_secondary_interface} type: eth proto: static address: ${_param:single_address} netmask: 255.255.255.0 - ens6: + public_int: enabled: true + name: ${_param:opnfv_fn_vm_quaternary_interface} type: eth proto: static address: ${_param:cluster_public_host} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml index 926259023..f726c4af2 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml @@ -4,9 +4,9 @@ classes: - system.linux.system.repo.saltstack.xenial parameters: _param: - primary_interface: ens4 - tenant_interface: ens5 - external_interface: ens6 + primary_interface: ${_param:opnfv_fn_vm_secondary_interface} + tenant_interface: ${_param:opnfv_fn_vm_tertiary_interface} + external_interface: ${_param:opnfv_fn_vm_quaternary_interface} interface_mtu: 9000 linux_system_codename: xenial neutron: @@ -19,7 +19,7 @@ parameters: interface: dhcp_int: enabled: true - name: ens3 + name: ${_param:opnfv_fn_vm_primary_interface} proto: dhcp type: eth mtu: ${_param:interface_mtu} |