diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2018-04-17 08:24:18 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2018-04-19 15:20:51 -0600 |
| commit | f65dbaef830fe7121173fdb83e5e4dde09b11a8a (patch) | |
| tree | fa2c1a7bdc5fdc10b28c8ba722ff324267e9444a /examples/complex-network/deploy-complex-network.yaml | |
| parent | bd658dbe250e93a9fa4405b99ecdb2ad1a7029b6 (diff) | |
Fixed bug with regards to subnet lookups.
Neutron returns all subnets regardless of visibility which cause problems
within routers if there is another subnet with the same name attached to
a different network.
JIRA: SNAPS-304
In addition, this patch contains two other minor fixes.
launch_utils.py - raise an exception when the creator is not properly instantiated
network.py - allow fixed IPs to be none.
Change-Id: Ib343074d925be4592a713727a03d5b531890eada
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'examples/complex-network/deploy-complex-network.yaml')
| -rw-r--r-- | examples/complex-network/deploy-complex-network.yaml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/examples/complex-network/deploy-complex-network.yaml b/examples/complex-network/deploy-complex-network.yaml index 7915c38..be38794 100644 --- a/examples/complex-network/deploy-complex-network.yaml +++ b/examples/complex-network/deploy-complex-network.yaml @@ -70,8 +70,14 @@ openstack: name: mgr-router external_gateway: external internal_subnets: - - mgr-subnet - - mgr-subnet-2 + - subnet: + project_name: admin + network_name: mgr-net + subnet_name: mgr-subnet + - subnet: + project_name: admin + network_name: mgr-net + subnet_name: mgr-subnet-2 interfaces: - port: name: mgr-router-to-site1 @@ -83,12 +89,18 @@ openstack: name: site1-router external_gateway: external internal_subnets: - - site1-subnet + - subnet: + project_name: admin + network_name: site1-net + subnet_name: site1-subnet - router: name: site2-router external_gateway: external internal_subnets: - - site2-subnet + - subnet: + project_name: admin + network_name: site2-net + subnet_name: site2-subnet - router: name: site-to-site-router interfaces: |