Revert "Use keystone_authtoken macros for auth"

This patch breaks glance and as result it does not respond on any requests and image bootstrap failed constantly 

This reverts commit f1d9d96886.

Change-Id: I38a0cf22fc516a38be56649b1902e489f0040392

service/files/glance-api.conf.j2

@@ -19,7 +19,17 @@ show_multiple_locations = true
 connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}
 max_retries = -1
 
-{{ keystone_authtoken.keystone_authtoken(glance.user, glance.password) }}
+[keystone_authtoken]
+auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
+auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
+auth_type = password
+project_domain_id = default
+user_domain_id = default
+project_name = service
+username = {{ glance.user }}
+password = {{ glance.password }}
+memcached_servers = {{ address('memcached', memcached.port) }}
+
 
 [paste_deploy]
 flavor = keystone

service/files/glance-registry.conf.j2

@@ -12,6 +12,17 @@ bind_port = {{ glance.registry_port.cont }}
 connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}
 max_retries = -1
 
+[keystone_authtoken]
+auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
+auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
+auth_type = password
+project_domain_id = default
+user_domain_id = default
+project_name = service
+username = {{ glance.user }}
+password = {{ glance.password }}
+memcached_servers = {{ address('memcached', memcached.port) }}
+
 [paste_deploy]
 flavor = keystone
 

service/glance-api.yaml

@@ -27,14 +27,15 @@ service:
           command: glance-manage db_sync
         - name: glance-user-create
           dependencies:
-            - keystone-create-domain
+            - keystone
           type: single
-          command: openstack user create --domain {{ service_account.domain }} --password {{ glance.password  }} {{ glance.user }}
+          command: openstack user create --domain default --password {{ glance.password  }} {{ glance.user }}
         - name: glance-role-add
           dependencies:
             - glance-user-create
+            - keystone-create-project
           type: single
-          command: openstack role add --domain {{ service_account.domain }} --user {{ glance.user }} admin
+          command: openstack role add --project service --user {{ glance.user }} admin
         - name: glance-service-create
           dependencies:
             - keystone