From 277d04b54168b0ae6332f38cff47dfb8a76dcd2e Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 2 Sep 2015 17:19:36 +0200 Subject: [PATCH 1/2] Add admin user as admin role to service tenant Signed-off-by: Bogdan Dobrelya --- example-puppet.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/example-puppet.py b/example-puppet.py index e551eeb3..0bd61ecd 100755 --- a/example-puppet.py +++ b/example-puppet.py @@ -105,6 +105,9 @@ def setup_resources(): services_tenant = vr.create('services_tenant', 'resources/keystone_tenant', { 'tenant_name': 'services' })[0] + admin_role_services = vr.create('admin_role_services', 'resources/keystone_role', { + 'role_name': 'admin' + })[0] signals.connect(node1, keystone_db) signals.connect(node1, keystone_db_user) @@ -138,6 +141,9 @@ def setup_resources(): }) signals.connect(admin_tenant, admin_user) signals.connect(admin_user, admin_role) + signals.connect(admin_user, admin_role_services) + signals.disconnect_receiver_by_input(admin_role_services, 'tenant_name') + signals.connect(services_tenant, admin_role_services, { 'tenant_name' }) signals.connect(keystone_puppet, services_tenant) signals.connect(keystone_puppet, services_tenant, { From 576992bba0b81d194538a8896a8272d28882888c Mon Sep 17 00:00:00 2001 From: Przemyslaw Kaminski Date: Thu, 3 Sep 2015 14:10:00 +0200 Subject: [PATCH 2/2] example-puppet.py: admin_role_services explicit disconnect wasn't needed --- example-puppet.py | 1 - 1 file changed, 1 deletion(-) diff --git a/example-puppet.py b/example-puppet.py index 0bd61ecd..ab638bd5 100755 --- a/example-puppet.py +++ b/example-puppet.py @@ -142,7 +142,6 @@ def setup_resources(): signals.connect(admin_tenant, admin_user) signals.connect(admin_user, admin_role) signals.connect(admin_user, admin_role_services) - signals.disconnect_receiver_by_input(admin_role_services, 'tenant_name') signals.connect(services_tenant, admin_role_services, { 'tenant_name' }) signals.connect(keystone_puppet, services_tenant)