From 003c7b029ea50a01c3311d1794f8816085950842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= <loles@mirantis.com>
Date: Thu, 25 Jun 2015 14:00:58 +0000
Subject: [PATCH] Add admin token, fix keystone_admin_port

---
 templates/openstack_base.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/openstack_base.yml b/templates/openstack_base.yml
index 23d4e52a..dff1c142 100644
--- a/templates/openstack_base.yml
+++ b/templates/openstack_base.yml
@@ -7,6 +7,7 @@ resources:
       tenant_name: admin
       keystone_port: '{{keystone_port}}'
       keystone_host: '{{keystone_ip}}'
+      admin_token: '{{admin_token}}'
       ip: '{{ip}}'
       ssh_user: '{{ssh_user}}'
       ssh_key: '{{ssh_key}}'
@@ -19,6 +20,7 @@ resources:
       tenant_name: 'admin_tenant::tenant_name'
       keystone_port: '{{keystone_port}}'
       keystone_host: '{{keystone_ip}}'
+      admin_token: '{{admin_token}}'
       ip: '{{ip}}'
       ssh_user: '{{ssh_user}}'
       ssh_key: '{{ssh_key}}'
@@ -34,9 +36,10 @@ resources:
       description: 'OpenStack Identity Service'
       type: 'identity'
       admin_port: '{{keystone_port}}'
-      port: 'keystone_admin_port'
+      port: '{{keystone_admin_port}}'
       keystone_port: '{{keystone_port}}'
       keystone_host: '{{keystone_ip}}'
+      admin_token: '{{admin_token}}'
       ip: '{{ip}}'
       ssh_user: '{{ssh_user}}'
       ssh_key: '{{ssh_key}}'
@@ -47,6 +50,7 @@ resources:
       tenant_name: services
       keystone_port: '{{keystone_port}}'
       keystone_host: '{{keystone_ip}}'
+      admin_token: '{{admin_token}}'
       ip: '{{ip}}'
       ssh_user: '{{ssh_user}}'
       ssh_key: '{{ssh_key}}'