Fixed bug with regards to subnet lookups.

[snaps.git] / examples / complex-network / deploy-complex-network.yaml

diff --git a/examples/complex-network/deploy-complex-network.yaml b/examples/complex-network/deploy-complex-network.yaml
index 42559e8..be38794 100644 (file)
--- a/examples/complex-network/deploy-complex-network.yaml
+++ b/examples/complex-network/deploy-complex-network.yaml
@@ -17,8 +17,8 @@ openstack:
   connection:
     # Note - when http_proxy is set, you must also configure ssh for proxy tunneling on your host.
     username: admin
-    password: cable123
-    auth_url: http://10.197.103.50:5000/v2.0/
+    password: NotMyPASS!
+    auth_url: http://10.10.10.50:5000/v2.0/
     project_name: admin
     http_proxy: localhost:3128
   images:
@@ -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:
@@ -128,7 +140,7 @@ openstack:
                 - subnet_name: mgr-subnet-2
                   ip: 10.0.2.30
         floating_ips:
-# TODO - Why is only one of these floating IPs not working and why does it vary which one?
+# Add back after validation of multiple floating IP support
 #          - floating_ip:
 #              name: fip1
 #              port_name: mgr-app-port
@@ -199,7 +211,7 @@ openstack:
               port_name: site2-host-port
               subnet_name: site2-subnet
               router_name: site2-router
-# TODO - Add a playbook here...
+# Add a playbook here...
 #ansible:
 #    - playbook_location: main.yml
 #      hosts: