diff --git a/example-puppet.py b/example-puppet.py
index 7e565631..01781817 100644
--- a/example-puppet.py
+++ b/example-puppet.py
@@ -4,7 +4,6 @@ import time
 
 from solar.core import actions
 from solar.core import resource
-from solar.core.provider import  GitProvider
 from solar.core import signals
 from solar.core import validation
 from solar.core.resource import virtual_resource as vr
@@ -37,80 +36,199 @@ def deploy():
 
     signals.Connections.clear()
 
-    node1 = vr.create('node1', 'resources/ro_node/', {'ip': '10.0.0.3', 'ssh_key': '/vagrant/.vagrant/machines/solar-dev1/virtualbox/private_key', 'ssh_user': 'vagrant'})[0]
+    node1 = vr.create('node1', 'resources/ro_node/', {
+        'ip': '10.0.0.3',
+        'ssh_key': '/vagrant/.vagrant/machines/solar-dev1/virtualbox/private_key',
+        'ssh_user': 'vagrant'
+    })[0]
 
-    rabbitmq_service1 = vr.create('rabbitmq_service1', 'resources/rabbitmq_service/', {'management_port': 15672, 'port': 5672, 'container_name': 'rabbitmq_service1', 'image': 'rabbitmq:3-management'})[0]
-    openstack_vhost = vr.create('openstack_vhost', 'resources/rabbitmq_vhost/', {'vhost_name': 'openstack'})[0]
-    openstack_rabbitmq_user = vr.create('openstack_rabbitmq_user', 'resources/rabbitmq_user/', {'user_name': 'openstack', 'password': 'openstack_password'})[0]
+    rabbitmq_service1 = vr.create('rabbitmq_service1', 'resources/rabbitmq_service/', {
+        'management_port': 15672,
+        'port': 5672,
+        'container_name': 'rabbitmq_service1',
+        'image': 'rabbitmq:3-management'
+    })[0]
+    openstack_vhost = vr.create('openstack_vhost', 'resources/rabbitmq_vhost/', {
+        'vhost_name': 'openstack'
+    })[0]
 
-    mariadb_service1 = vr.create('mariadb_service1', 'resources/mariadb_service', {'image': 'mariadb', 'root_password': 'mariadb', 'port': 3306})[0]
+    openstack_rabbitmq_user = vr.create('openstack_rabbitmq_user', 'resources/rabbitmq_user/', {
+        'user_name': 'openstack',
+        'password': 'openstack_password'
+    })[0]
+
+    mariadb_service1 = vr.create('mariadb_service1', 'resources/mariadb_service', {
+        'image': 'mariadb',
+        'port': 3306
+    })[0]
 
     signals.connect(node1, mariadb_service1)
     signals.connect(node1, rabbitmq_service1)
     signals.connect(rabbitmq_service1, openstack_vhost)
     signals.connect(rabbitmq_service1, openstack_rabbitmq_user)
-    signals.connect(openstack_vhost, openstack_rabbitmq_user, {'vhost_name': 'vhost_name'})
+    signals.connect(openstack_vhost, openstack_rabbitmq_user, {
+        'vhost_name': 'vhost_name'
+    })
 
     # KEYSTONE
     keystone_puppet = vr.create('keystone_puppet', 'resources/keystone_puppet', {})[0]
-    keystone_db = vr.create('keystone_db', 'resources/mariadb_keystone_db/', {'db_name': 'keystone_db', 'login_user': 'root'})[0]
-    keystone_db_user = vr.create('keystone_db_user', 'resources/mariadb_keystone_user/', {'new_user_name': 'keystone', 'new_user_password': 'keystone', 'login_user': 'root'})[0]
-    keystone_service_endpoint = vr.create('keystone_service_endpoint', 'resources/keystone_service_endpoint', {'endpoint_name': 'keystone', 'adminurl': 'http://{{admin_ip}}:{{admin_port}}/v2.0', 'internalurl': 'http://{{internal_ip}}:{{internal_port}}/v2.0', 'publicurl': 'http://{{public_ip}}:{{public_port}}/v2.0', 'description': 'OpenStack Identity Service', 'type': 'identity'})[0]
+    keystone_db = vr.create('keystone_db', 'resources/mariadb_keystone_db/', {
+        'db_name': 'keystone_db',
+        'login_user': 'root'
+    })[0]
+    keystone_db_user = vr.create('keystone_db_user', 'resources/mariadb_keystone_user/', {
+        'new_user_name': 'keystone',
+        'new_user_password': 'keystone',
+    })[0]
+    keystone_service_endpoint = vr.create('keystone_service_endpoint', 'resources/keystone_service_endpoint', {
+        'endpoint_name': 'keystone',
+        'adminurl': 'http://{{admin_ip}}:{{admin_port}}/v2.0',
+        'internalurl': 'http://{{internal_ip}}:{{internal_port}}/v2.0',
+        'publicurl': 'http://{{public_ip}}:{{public_port}}/v2.0',
+        'description': 'OpenStack Identity Service',
+        'type': 'identity'
+    })[0]
 
-    admin_tenant = vr.create('admin_tenant', 'resources/keystone_tenant', {'tenant_name': 'admin'})[0]
-    admin_user = vr.create('admin_user', 'resources/keystone_user', {'user_name': 'admin', 'user_password': 'admin'})[0]
-    admin_role = vr.create('admin_role', 'resources/keystone_role', {'role_name': 'admin'})[0]
-    services_tenant = vr.create('services_tenant', 'resources/keystone_tenant', {'tenant_name': 'services'})[0]
+    admin_tenant = vr.create('admin_tenant', 'resources/keystone_tenant', {
+        'tenant_name': 'admin'
+    })[0]
+    admin_user = vr.create('admin_user', 'resources/keystone_user', {
+        'user_name': 'admin',
+        'user_password': 'admin'
+    })[0]
+    admin_role = vr.create('admin_role', 'resources/keystone_role', {
+        'role_name': 'admin'
+    })[0]
+    services_tenant = vr.create('services_tenant', 'resources/keystone_tenant', {
+        'tenant_name': 'services'
+    })[0]
 
     signals.connect(node1, rabbitmq_service1)
     signals.connect(rabbitmq_service1, openstack_vhost)
     signals.connect(rabbitmq_service1, openstack_rabbitmq_user)
-    signals.connect(openstack_vhost, openstack_rabbitmq_user, {'vhost_name': 'vhost_name'})
+    signals.connect(openstack_vhost, openstack_rabbitmq_user, {
+        'vhost_name': 'vhost_name'
+    })
 
     signals.connect(node1, mariadb_service1)
     signals.connect(node1, keystone_db)
     signals.connect(node1, keystone_db_user)
     signals.connect(node1, keystone_puppet)
-    signals.connect(mariadb_service1, keystone_db, {'port': 'login_port', 'root_password': 'login_password'})
-    signals.connect(mariadb_service1, keystone_db_user, {'port': 'login_port', 'root_password': 'login_password'})
-    signals.connect(keystone_db, keystone_db_user, {'db_name': 'db_name'})
+    signals.connect(mariadb_service1, keystone_db, {
+        'port': 'login_port',
+        'root_password': 'login_password'
+    })
+    signals.connect(mariadb_service1, keystone_db_user, {
+        'port': 'login_port',
+        'root_user': 'login_user',
+        'root_password': 'login_password',
+    })
+    signals.connect(keystone_db, keystone_db_user, {
+        'db_name': 'db_name'
+    })
 
     signals.connect(node1, keystone_service_endpoint)
-    signals.connect(keystone_puppet, keystone_service_endpoint, {'admin_token': 'admin_token', 'admin_port': 'keystone_admin_port', 'ip': 'keystone_host'})
-    signals.connect(keystone_puppet, keystone_service_endpoint, {'admin_port': 'admin_port', 'ip': 'admin_ip'})
-    signals.connect(keystone_puppet, keystone_service_endpoint, {'port': 'internal_port', 'ip': 'internal_ip'})
-    signals.connect(keystone_puppet, keystone_service_endpoint, {'port': 'public_port', 'ip': 'public_ip'})
+    signals.connect(keystone_puppet, keystone_service_endpoint, {
+        'admin_token': 'admin_token',
+        'admin_port': 'keystone_admin_port',
+        'ip': 'keystone_host'
+    })
+    signals.connect(keystone_puppet, keystone_service_endpoint, {
+        'admin_port': 'admin_port',
+        'ip': 'admin_ip'
+    })
+    signals.connect(keystone_puppet, keystone_service_endpoint, {
+        'port': 'internal_port',
+        'ip': 'internal_ip'
+    })
+    signals.connect(keystone_puppet, keystone_service_endpoint, {
+        'port': 'public_port',
+        'ip': 'public_ip'
+    })
 
     signals.connect(keystone_puppet, admin_tenant)
-    signals.connect(keystone_puppet, admin_tenant, {'admin_port': 'keystone_port', 'ip': 'keystone_host'})
+    signals.connect(keystone_puppet, admin_tenant, {
+        'admin_port': 'keystone_port',
+        'ip': 'keystone_host'
+    })
     signals.connect(admin_tenant, admin_user)
     signals.connect(admin_user, admin_role)
 
     signals.connect(keystone_puppet, services_tenant)
-    signals.connect(keystone_puppet, services_tenant, {'admin_port': 'keystone_port', 'ip': 'keystone_host'})
+    signals.connect(keystone_puppet, services_tenant, {
+        'admin_port': 'keystone_port',
+        'ip': 'keystone_host'
+    })
 
-    signals.connect(keystone_db, keystone_puppet, {'db_name': 'db_name'})
-    signals.connect(keystone_db_user, keystone_puppet, {'new_user_name': 'db_user', 'new_user_password': 'db_password'})
+    signals.connect(keystone_db, keystone_puppet, {
+        'db_name': 'db_name'
+    })
+    signals.connect(keystone_db_user, keystone_puppet, {
+        'new_user_name': 'db_user',
+        'new_user_password': 'db_password'
+    })
 
     # NEUTRON
     # TODO: vhost cannot be specified in neutron Puppet manifests so this user has to be admin anyways
-    neutron_puppet = vr.create('neutron_puppet', 'resources/neutron_puppet', {'rabbitmq_user': 'guest', 'rabbitmq_password': 'guest'})[0]
+    neutron_puppet = vr.create('neutron_puppet', 'resources/neutron_puppet', {
+        'rabbitmq_user': 'guest',
+        'rabbitmq_password': 'guest'
+    })[0]
 
-    neutron_keystone_user = vr.create('neutron_keystone_user', 'resources/keystone_user', {'user_name': 'neutron', 'user_password': 'neutron'})[0]
-    neutron_keystone_role = vr.create('neutron_keystone_role', 'resources/keystone_role', {'role_name': 'neutron'})[0]    
-    neutron_keystone_service_endpoint = vr.create('neutron_keystone_service_endpoint', 'resources/keystone_service_endpoint', {'endpoint_name': 'neutron', 'adminurl': 'http://{{admin_ip}}:{{admin_port}}', 'internalurl': 'http://{{internal_ip}}:{{internal_port}}', 'publicurl': 'http://{{public_ip}}:{{public_port}}', 'description': 'OpenStack Network Service', 'type': 'network'})[0]
+    neutron_keystone_user = vr.create('neutron_keystone_user', 'resources/keystone_user', {
+        'user_name': 'neutron',
+        'user_password': 'neutron'
+    })[0]
+    neutron_keystone_role = vr.create('neutron_keystone_role', 'resources/keystone_role', {
+        'role_name': 'neutron'
+    })[0]
+    neutron_keystone_service_endpoint = vr.create('neutron_keystone_service_endpoint', 'resources/keystone_service_endpoint', {
+        'endpoint_name': 'neutron',
+        'adminurl': 'http://{{admin_ip}}:{{admin_port}}',
+        'internalurl': 'http://{{internal_ip}}:{{internal_port}}',
+        'publicurl': 'http://{{public_ip}}:{{public_port}}',
+        'description': 'OpenStack Network Service',
+        'type': 'network'
+    })[0]
 
     signals.connect(node1, neutron_puppet)
-    signals.connect(rabbitmq_service1, neutron_puppet, {'ip': 'rabbitmq_host', 'port': 'rabbitmq_port'})
-    signals.connect(admin_user, neutron_puppet, {'user_name': 'keystone_user', 'user_password': 'keystone_password', 'tenant_name': 'keystone_tenant'})
-    signals.connect(keystone_puppet, neutron_puppet, {'ip': 'keystone_host', 'port': 'keystone_port'})
+    signals.connect(rabbitmq_service1, neutron_puppet, {
+        'ip': 'rabbitmq_host',
+        'port': 'rabbitmq_port'
+    })
+    signals.connect(admin_user, neutron_puppet, {
+        'user_name': 'keystone_user',
+        'user_password': 'keystone_password',
+        'tenant_name': 'keystone_tenant'
+    })
+    signals.connect(keystone_puppet, neutron_puppet, {
+        'ip': 'keystone_host',
+        'port': 'keystone_port'
+    })
     signals.connect(services_tenant, neutron_keystone_user)
     signals.connect(neutron_keystone_user, neutron_keystone_role)
-    signals.connect(keystone_puppet, neutron_keystone_service_endpoint, {'ip': 'ip', 'ssh_key': 'ssh_key', 'ssh_user': 'ssh_user'})
-    signals.connect(neutron_puppet, neutron_keystone_service_endpoint, {'ip': 'admin_ip', 'port': 'admin_port'})
-    signals.connect(neutron_puppet, neutron_keystone_service_endpoint, {'ip': 'internal_ip', 'port': 'internal_port'})
-    signals.connect(neutron_puppet, neutron_keystone_service_endpoint, {'ip': 'public_ip', 'port': 'public_port'})
-    signals.connect(keystone_puppet, neutron_keystone_service_endpoint, {'ip': 'keystone_host', 'admin_port': 'keystone_admin_port', 'admin_token': 'admin_token'})
+    signals.connect(keystone_puppet, neutron_keystone_service_endpoint, {
+        'ip': 'ip',
+        'ssh_key': 'ssh_key',
+        'ssh_user': 'ssh_user'
+    })
+    signals.connect(neutron_puppet, neutron_keystone_service_endpoint, {
+        'ip': 'admin_ip',
+        'port': 'admin_port'
+    })
+    signals.connect(neutron_puppet, neutron_keystone_service_endpoint, {
+        'ip': 'internal_ip',
+        'port': 'internal_port'
+    })
+    signals.connect(neutron_puppet, neutron_keystone_service_endpoint, {
+        'ip': 'public_ip',
+        'port': 'public_port'
+    })
+    signals.connect(keystone_puppet, neutron_keystone_service_endpoint, {
+        'ip': 'keystone_host',
+        'admin_port': 'keystone_admin_port',
+        'admin_token': 'admin_token'
+    })
 
     # # CINDER
     # cinder_puppet = vr.create('cinder_puppet', 'resources/cinder_puppet', {