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-ovs-dpdk | |
| 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-ovs-dpdk')
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 4 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml index 87a42105f..784011ad0 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml @@ -7,9 +7,9 @@ parameters: node: openstack_compute_node01: params: - dpdk0_name: ens5 + dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface} dpdk0_pci: '"0000:00:05.0"' openstack_compute_node02: params: - dpdk0_name: ens5 + dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface} dpdk0_pci: '"0000:00:05.0"' diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml index 77e238057..e4e09b52b 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml @@ -1,5 +1,6 @@ classes: - system.linux.system.single +- cluster.all-mcp-ocata-common - cluster.virtual-mcp-ocata-common.init_options - cluster.virtual-mcp-ocata-common.infra - cluster.virtual-mcp-ocata-ovs-dpdk.openstack |