diff --git a/keystone/client.sls b/keystone/client.sls
index c5887e8..151bf55 100644
--- a/keystone/client.sls
+++ b/keystone/client.sls
@@ -17,6 +17,10 @@
 keystone_client_roles:
   keystone.role_present:
   - names: {{ client.roles }}
+  - connection_user: {{ client.server.user }}
+  - connection_password: {{ client.server.password }}
+  - connection_tenant: {{ client.server.tenant }}
+  - connection_auth_url: 'http://{{ client.server.host }}:{{ client.server.public_port }}/v2.0/'
   - require:
     - file: keystone_salt_config
 
@@ -25,6 +29,10 @@
 keystone_tenant_{{ tenant_name }}:
   keystone.tenant_present:
   - name: {{ tenant_name }}
+  - connection_user: {{ client.server.user }}
+  - connection_password: {{ client.server.password }}
+  - connection_tenant: {{ client.server.tenant }}
+  - connection_auth_url: 'http://{{ client.server.host }}:{{ client.server.public_port }}/v2.0/'
   - require:
     - keystone: keystone_client_roles
 
@@ -45,6 +53,10 @@
         {%- else %}
         - Member
         {%- endif %}
+  - connection_user: {{ client.server.user }}
+  - connection_password: {{ client.server.password }}
+  - connection_tenant: {{ client.server.tenant }}
+  - connection_auth_url: 'http://{{ client.server.host }}:{{ client.server.public_port }}/v2.0/'
   - require:
     - keystone: keystone_tenant_{{ tenant_name }}
 
diff --git a/keystone/server.sls b/keystone/server.sls
index bf3fc4b..5d1cfc6 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -200,6 +200,8 @@
 keystone_service_tenant:
   keystone.tenant_present:
   - name: {{ server.service_tenant }}
+  - connection_token: {{ server.service_token }}
+  - connection_endpoint: 'http://{{ server.bind.address }}:{{ server.bind.private_port }}/v2.0'
   - require:
     - cmd: keystone_syncdb
     - file: keystone_salt_config
@@ -207,12 +209,16 @@
 keystone_admin_tenant:
   keystone.tenant_present:
   - name: {{ server.admin_tenant }}
+  - connection_token: {{ server.service_token }}
+  - connection_endpoint: 'http://{{ server.bind.address }}:{{ server.bind.private_port }}/v2.0'
   - require:
     - keystone: keystone_service_tenant
 
 keystone_roles:
   keystone.role_present:
   - names: {{ server.roles }}
+  - connection_token: {{ server.service_token }}
+  - connection_endpoint: 'http://{{ server.bind.address }}:{{ server.bind.private_port }}/v2.0'
   - require:
     - keystone: keystone_service_tenant
 
@@ -225,6 +231,8 @@
   - roles:
       {{ server.admin_tenant }}:
       - admin
+  - connection_token: {{ server.service_token }}
+  - connection_endpoint: 'http://{{ server.bind.address }}:{{ server.bind.private_port }}/v2.0'
   - require:
     - keystone: keystone_admin_tenant
     - keystone: keystone_roles
@@ -236,6 +244,8 @@
   - name: {{ service_name }}
   - service_type: {{ service.type }}
   - description: {{ service.description }}
+  - connection_token: {{ server.service_token }}
+  - connection_endpoint: 'http://{{ server.bind.address }}:{{ server.bind.private_port }}/v2.0'
   - require:
     - keystone: keystone_roles
 
@@ -246,6 +256,8 @@
   - internalurl: '{{ service.bind.get('internal_protocol', 'http') }}://{{ service.bind.internal_address }}:{{ service.bind.internal_port }}{{ service.bind.internal_path }}'
   - adminurl: '{{ service.bind.get('admin_protocol', 'http') }}://{{ service.bind.admin_address }}:{{ service.bind.admin_port }}{{ service.bind.admin_path }}'
   - region: {{ service.get('region', 'RegionOne') }}
+  - connection_token: {{ server.service_token }}
+  - connection_endpoint: 'http://{{ server.bind.address }}:{{ server.bind.private_port }}/v2.0'
   - require:
     - keystone: keystone_{{ service_name }}_service
     - file: keystone_salt_config
@@ -261,6 +273,8 @@
   - roles:
       {{ server.service_tenant }}:
       - admin
+  - connection_token: {{ server.service_token }}
+  - connection_endpoint: 'http://{{ server.bind.address }}:{{ server.bind.private_port }}/v2.0'
   - require:
     - keystone: keystone_roles
 
@@ -273,6 +287,8 @@
 keystone_tenant_{{ tenant_name }}:
   keystone.tenant_present:
   - name: {{ tenant_name }}
+  - connection_token: {{ server.service_token }}
+  - connection_endpoint: 'http://{{ server.bind.address }}:{{ server.bind.private_port }}/v2.0'
   - require:
     - keystone: keystone_roles
 
@@ -291,6 +307,8 @@
       {%- else %}
       - Member
       {%- endif %}
+  - connection_token: {{ server.service_token }}
+  - connection_endpoint: 'http://{{ server.bind.address }}:{{ server.bind.private_port }}/v2.0'
   - require:
     - keystone: keystone_tenant_{{ tenant_name }}