diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-27 12:47:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-27 12:47:38 +0000 |
| commit | 1c5912c2f528b2c972307f9f9982492754ab233e (patch) | |
| tree | a169a666f7ba8a7f1a6bb004c70df0058a3cac74 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml | |
| parent | a27ad89c0d97ff1be7f40af51b59df8d26dc7fe4 (diff) | |
| parent | 48f978f10c6f31ea1b9e0d5aabfe8a83c96081fd (diff) | |
Merge "Extended PDF support to all baremetal scenarios" into stable/euphrates
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml index 82b1a6eff..ba0f385e7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml @@ -91,19 +91,19 @@ parameters: netmask: 255.255.255.0 mtu: 1500 use_interfaces: - - ${_param:tenant_nic}.302 - vlan300: + - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} + mgmt-vlan: enabled: true proto: manual type: vlan - name: ${_param:mgmt_nic}.300 + name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - ${_param:mgmt_nic} - vlan302: + tenant-vlan: enabled: true proto: manual type: vlan - name: ${_param:tenant_nic}.302 + name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} use_interfaces: - ${_param:tenant_nic} br-ctl: @@ -113,7 +113,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:mgmt_nic}.300 + - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} br-floating: enabled: true type: ovs_bridge |