| commit | 0489314512db2cd4d94e25b3d4690062b0b8c118 | [log] [tgz] |
|---|---|---|
| author | Jiri Broulik <jbroulik@mirantis.com> | Tue Apr 25 15:10:46 2017 +0200 |
| committer | Jiri Broulik <jbroulik@mirantis.com> | Tue Apr 25 15:10:46 2017 +0200 |
| tree | 92cd2107a6f31ed3f35206abd6d3cd3bc64b7a35 | |
| parent | eaae24fc18edcf6312aac1cfde768ac04819ca15 [diff] |
nfv labs fixes Change-Id: Ide4186a9e98411b4ecc260b589fca7ff990abc6c
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml index a64e1e8..7b96ef7 100644 --- a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml +++ b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
@@ -28,6 +28,7 @@ cluster_node03_address: ${_param:opencontrail_control_node03_address} opencontrail_router01_hostname: vsrx01.${_param:cluster_domain} opencontrail_router01_address: 172.16.10.131 + openstack_version: mitaka linux: network: interface:
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml index e16ae19..80408fb 100644 --- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml +++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
@@ -79,4 +79,6 @@ n_rxq: 2 br-prv: enabled: true - type: dpdk_ovs_bridge \ No newline at end of file + type: dpdk_ovs_bridge + address: ${_param:tenant_address} + netmask: 255.255.255.0 \ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml index 749df07..1cf25df 100644 --- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml +++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
@@ -72,6 +72,8 @@ br-prv: enabled: true type: ovs_bridge + address: ${_param:tenant_address} + netmask: 255.255.255.0 floating-to-prv: enabled: true type: ovs_port