From 0d81b83552ca469c0b0d9c5861fc05d46b1c0a1a Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Fri, 7 Aug 2015 12:49:42 +0200 Subject: [PATCH] Add composition layer for nodes networking Signed-off-by: Bogdan Dobrelya --- examples/openstack/openstack.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/examples/openstack/openstack.py b/examples/openstack/openstack.py index 6f22faf..bf211f7 100755 --- a/examples/openstack/openstack.py +++ b/examples/openstack/openstack.py @@ -57,8 +57,19 @@ def setup_resources(): resources = vr.create('nodes', 'templates/nodes_with_transports.yaml', {"count": 2}) nodes = [x for x in resources if x.name.startswith('node')] node1, node2 = nodes + resources = vr.create('nodes_network', 'templates/nodes_network.yml', {"count": 2}) + nodes_sdn = [x for x in resources if x.name.startswith('node')] + node1_sdn, node2_sdn = nodes_sdn + # NETWORKING + node1_network_puppet = vr.create('node1_network_puppet', 'resources/node_network_puppet', {})[0] + node2_network_puppet = vr.create('node2_network_puppet', 'resources/node_network_puppet', {})[0] + signals.connect(node1, node1_sdn) + signals.connect(node1, node2_sdn) + signals.connect(node1_sdn, node1_network_puppet) + signals.connect(node2_sdn, node2_network_puppet) + # MARIADB mariadb_service1 = vr.create('mariadb_service1', 'resources/mariadb_service', { 'image': 'mariadb', @@ -617,6 +628,8 @@ def setup_resources(): resources_to_run = [ + 'node1_network_puppet', + 'rabbitmq_service1', 'openstack_vhost', 'openstack_rabbitmq_user', @@ -669,6 +682,8 @@ resources_to_run = [ 'nova_conductor_puppet', 'nova_scheduler_puppet', + 'node2_network_puppet', + 'glance_db', 'glance_db_user', 'glance_keystone_user',