diff --git a/resources/keystone_puppet/actions/run.pp b/resources/keystone_puppet/actions/run.pp
index 9724fb2..7845a79 100644
--- a/resources/keystone_puppet/actions/run.pp
+++ b/resources/keystone_puppet/actions/run.pp
@@ -3,6 +3,7 @@ $resource = hiera($::resource_name)
 $ip = $resource['input']['ip']['value']
 $admin_token = $resource['input']['admin_token']['value']
 $db_user = $resource['input']['db_user']['value']
+$db_host = $resource['input']['db_host']['value']
 $db_password = $resource['input']['db_password']['value']
 $db_name = $resource['input']['db_name']['value']
 $admin_port = $resource['input']['admin_port']['value']
@@ -13,8 +14,9 @@ class {'keystone':
   verbose              => true,
   catalog_type         => 'sql',
   admin_token          => $admin_token,
-  database_connection  => "mysql://$db_user:$db_password@$ip/$db_name",
+  database_connection  => "mysql://$db_user:$db_password@$db_host/$db_name",
   public_port          => "$port",
+  admin_port           => "$admin_port",
   token_driver         => 'keystone.token.backends.kvs.Token'
 }
 
diff --git a/resources/keystone_puppet/meta.yaml b/resources/keystone_puppet/meta.yaml
index 8ee657a..cab4e1a 100644
--- a/resources/keystone_puppet/meta.yaml
+++ b/resources/keystone_puppet/meta.yaml
@@ -15,6 +15,9 @@ input:
     db_name:
       schema: str!
       value: keystone
+    db_host:
+      schema: str!
+      value: keystone
 
     admin_port:
       schema: int!
diff --git a/resources/rabbitmq_service/meta.yaml b/resources/rabbitmq_service/meta.yaml
index 69ef8a0..a153545 100644
--- a/resources/rabbitmq_service/meta.yaml
+++ b/resources/rabbitmq_service/meta.yaml
@@ -16,10 +16,10 @@ input:
     value: 'node1'
   port:
     schema: int!
-    value: ''
+    value: 5672
   management_port:
     schema: int! 
-    value: ''
+    value: 15672
   git:
     schema: {repository: str!, branch: str!}
     value: {repository: 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git', branch: '5.1.0'}
diff --git a/templates/controller.yml b/templates/controller.yml
index 194fd31..9376d04 100644
--- a/templates/controller.yml
+++ b/templates/controller.yml
@@ -35,19 +35,18 @@ resources:
     from: templates/keystone_api.yml
     values:
       idx: 1
-      image: 'kollaglue/centos-rdo-k-keystone'
-      config_dir: '/etc/solar/keystone_config_1'
       db_password: 'keystone_db_user::user_password'
       db_user: 'keystone_db_user::user_name'
       db_port: 'keystone_db_user::login_port'
       db_name: 'keystone_db_user::db_name'
       db_host: 'mariadb_service::ip'
+      admin_token: 132fdsfwqee
+      admin_port: 35357
+      port: 5000
       ip: '{{ip}}'
       ssh_user: '{{ssh_user}}'
       ssh_key: '{{ssh_key}}'
 
-  # TODO: HAproxy
-
   - id: openstack_base
     from: templates/openstack_base.yml
     values:
@@ -57,34 +56,20 @@ resources:
       keystone_ip: 'keystone_service_1::ip'
       keystone_admin_port: 'keystone_service_1::admin_port'
       keystone_port: 'keystone_service_1::port'
-      admin_token: 'keystone_config_1::admin_token'
+      admin_token: 'keystone_service_1::admin_token'
 
-  - id: glance_base
-    from: templates/glance_base.yml
+  - id: openrc_file
+    from: resources/openrc_file
     values:
-      login_user: root
-      login_password: 'mariadb_service::root_password'
-      login_port: 'mariadb_service::port'
-      db_name: 'glance'
-      user_password: 'glance'
-      user_name: 'glance'
+      keystone_host: 'keystone_service_1::ip'
+      keystone_port: 'keystone_service_1::admin_port'
+      tenant: 'admin_user::tenant_name'
+      user_name: 'admin_user::user_name'
+      password: 'admin_user::user_password'
+      
       ip: '{{ip}}'
-      ssh_user: '{{ssh_user}}'
       ssh_key: '{{ssh_key}}'
-
-  - id: glance_registry_1
-    from: templates/glance_registry.yml
-    values:
-      idx: 1
-      keystone_admin_port: 'keystone_service_1::admin_port'
-      keystone_ip: 'keystone_service_1::ip'
-      mysql_password: 'glance_db_user::user_password'
-      mysql_user: 'keystone_db_user::user_name'
-      mysql_db: 'keystone_db_user::db_name'
-      mysql_ip: 'mariadb_service::ip'
-      ip: '{{ip}}'
       ssh_user: '{{ssh_user}}'
-      ssh_key: '{{ssh_key}}'
 
 tags: ['resources/controller', 'resource/primary_controller']
 
diff --git a/templates/keystone_api.yml b/templates/keystone_api.yml
index a7e2efa..a37804c 100644
--- a/templates/keystone_api.yml
+++ b/templates/keystone_api.yml
@@ -1,27 +1,20 @@
 id: keystone_api_{{idx}}
 
 resources:
-  - id: keystone_config_{{idx}}
-    from: resources/keystone_config
+  - id: keystone_service_{{idx}}
+    from: resources/keystone_puppet
     values:
-      config_dir: '/etc/solar/keystone_{{idx}}'
+      admin_token: '{{admin_token}}'
       db_host: '{{db_host}}'
-      db_port: '{{db_port}}'
       db_name: '{{db_name}}'
       db_user: '{{db_user}}'
       db_password: '{{db_password}}'
+
+      admin_port: {{admin_port}}
+      port: {{port}}
       ip: '{{ip}}'
       ssh_user: '{{ssh_user}}'
       ssh_key: '{{ssh_key}}'
 
 
-  - id:  keystone_service_{{idx}}
-    from: resources/keystone_service
-    values:
-      image: 'kollaglue/centos-rdo-j-keystone'
-      config_dir: 'keystone_config_{{idx}}::config_dir'
-      ip: 'keystone_config_{{idx}}::ip'
-      ssh_user: 'keystone_config_{{idx}}::ssh_user'
-      ssh_key: 'keystone_config_{{idx}}::ssh_key'
-
 tags: ['resources/keystone', 'resource/keystone_api']
diff --git a/templates/openstack_base.yml b/templates/openstack_base.yml
index 7326802..db34acf 100644
--- a/templates/openstack_base.yml
+++ b/templates/openstack_base.yml
@@ -25,6 +25,19 @@ resources:
       ssh_user: '{{ssh_user}}'
       ssh_key: '{{ssh_key}}'
 
+  - id: admin_role
+    from: resources/keystone_role
+    values:
+      role_name: 'admin'
+      user_name: 'admin_user::user_name'
+      tenant_name: 'admin_user::tenant_name'
+      keystone_port: '{{keystone_admin_port}}'
+      keystone_host: '{{keystone_ip}}'
+      admin_token: '{{admin_token}}'
+      ip: '{{ip}}'
+      ssh_user: '{{ssh_user}}'
+      ssh_key: '{{ssh_key}}'
+
   - id: keystone_service_endpoint
     from: resources/keystone_service_endpoint
     values:
@@ -35,7 +48,7 @@ resources:
      {% endraw %}
       description: 'OpenStack Identity Service'
       type: 'identity'
-      name: 'keystone'
+      endpoint_name: 'keystone'
       admin_port: '{{keystone_admin_port}}'
       public_port: '{{keystone_port}}'
       internal_port: '{{keystone_port}}'