From fa1ad51ca9f77ac8a6f8187fc741a69c96f5242e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Wed, 4 Feb 2015 13:30:20 +0000
Subject: [PATCH] try this

---
 .../fed-cloud09.cloud.fedoraproject.org.yml   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 9fc1f22d13..de3a5148ad 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -245,17 +245,18 @@
   #  - openstack-nova-scheduler
 
   # flip endpoints internalurl to internal IP
-  #- shell: source /root/keystonerc_admin && keystone endpoint-list | awk '{print $2}'
-  #  register: ENDPOINT_ID
-  #- shell: source /root/keystonerc_admin && keystone endpoint-list |grep 1cd097ab63754d8fab2e87754ebb132f |grep -v {{ controller_private_ip }} && (keystone endpoint-delete 1cd097ab63754d8fab2e87754ebb132f && 
-  - keystone_service:
-      name=ceilometer
-      type=metering
-      description="Openstack Metering Service"
-      publicurl="http://{{ controller_public_ip }}:8777"
-      internalurl="http://{{ controller_private_ip }}:8777"
-      adminurl="http://{{ controller_private_ip }}:8777"
-      region="RegionOne"
+  # ceilometer
+  - shell: source /root/keystonerc_admin && keystone service-list | grep ceilometer | awk '{print $2}'
+    register: SERVICE_ID
+  - shell: source /root/keystonerc_admin && keystone endpoint-list | grep {{SERVICE_ID.stdout}} | awk '{print $2}'
+    register: ENDPOINT_ID
+  - shell: source /root/keystonerc_admin && keystone endpoint-list |grep {{SERVICE_ID.stdout}} |grep -v {{ controller_private_ip }} && (keystone endpoint-delete {{ENDPOINT_ID.stdout}} && keystone endpoint-create --region 'RegionOne' --service {{SERVICE_ID.stdout}} --publicurl 'http://{{controller_public_ip}}:8777'  --adminurl 'http://{{controller_private_ip}}:8777' --internalurl 'http://{{controller_private_ip}}:8777' )
+  # cinder
+  - shell: source /root/keystonerc_admin && keystone service-list | grep 'cinder ' | awk '{print $2}'
+    register: SERVICE_ID
+  - shell: source /root/keystonerc_admin && keystone endpoint-list | grep {{SERVICE_ID.stdout}} | awk '{print $2}'
+    register: ENDPOINT_ID
+  - shell: source /root/keystonerc_admin && keystone endpoint-list |grep {{SERVICE_ID.stdout}} |grep -v {{ controller_private_ip }} && (keystone endpoint-delete {{ENDPOINT_ID.stdout}} && keystone endpoint-create --region 'RegionOne' --service {{SERVICE_ID.stdout}} --publicurl 'http://{{controller_public_ip}}/v1/%(tenant_id)s'  --adminurl 'http://{{controller_private_ip}}/v1/%(tenant_id)s' --internalurl 'http://{{controller_private_ip}}/v1/%(tenant_id)s' )
 
   # configure cider with multi back-end
   # https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux_OpenStack_Platform/5/html/Cloud_Administrator_Guide/section_manage-volumes.html