Use keystone_authtoken macros for auth

Change-Id: I76ba0f9618ccb94804b9be4f4ca8a2b83e919ad9
Depends-on: Icd3a2276097a52e77a31cb7eeeffb2d5bca8492b

service/cinder-api.yaml

@@ -23,15 +23,14 @@ service:
           command: cinder-manage db sync
         - name: cinder-user-create
           dependencies:
-            - keystone
+            - keystone-create-domain
           type: single
-          command: openstack user create --domain default --password {{ cinder.password  }} {{ cinder.username }}
+          command: openstack user create --domain {{ service_account.domain }} --password {{ cinder.password }} {{ cinder.username }}
         - name: cinder-role-add
           dependencies:
             - cinder-user-create
-            - keystone-create-project
           type: single
-          command: openstack role add --project service --user {{ cinder.username }} admin
+          command: openstack role add --domain {{ service_account.domain }} --user {{ cinder.username }} admin
         - name: cinder-service-create
           dependencies:
             - keystone

service/files/cinder.conf.j2

@@ -28,17 +28,7 @@ transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('r
 connection = mysql+pymysql://{{ cinder.db.username }}:{{ cinder.db.password }}@{{ address(service.database) }}/{{ cinder.db.name }}
 max_retries = -1
 
-[keystone_authtoken]
-auth_version = v3
-auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
-auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
-auth_type = password
-project_domain_id = default
-user_domain_id = default
-project_name = service
-username = {{ cinder.username }}
-password = {{ cinder.password }}
-memcached_servers = {{ address('memcached', memcached.port) }}
+{{ keystone_authtoken.keystone_authtoken(cinder.username, cinder.password) }}
 
 [oslo_concurrency]
 lock_path = /var/lib/cinder/tmp