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-odl-router | |
| 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-odl-router')
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml | 1 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml index e0311de55..20d6d18d3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/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-odl-router.openstack diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml index 6bc0f510e..8f83ddee8 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml @@ -10,8 +10,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} |