From d35de18275874d61634b3faecaa54011110f9b94 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Mon, 25 Jan 2016 22:23:31 -0500
Subject: Patches keystone endpoint setup to include Aodh

Note this behavior has changed in TripleO post Brahmaputra.  The
endpoints and services are created in THT rather than hardcoded in
tripleoclient.

JIRA: APEX-65

Change-Id: Ie595f2778fb509213e2992bf1ef60df82cf22666
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 ci/deploy.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'ci')

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 73430901..949db04f 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -35,6 +35,7 @@ ping_site="8.8.8.8"
 ntp_server="pool.ntp.org"
 net_isolation_enabled="TRUE"
 post_config="TRUE"
+debug="FALSE"
 
 declare -i CNT
 declare UNDERCLOUD
@@ -862,6 +863,15 @@ EOF
 openstack overcloud deploy --templates $DEPLOY_OPTIONS
 EOI
 
+  if [ "$debug" == 'TRUE' ]; then
+      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+source overcloudrc
+echo "Keystone Endpoint List:"
+keystone endpoint-list
+echo "Keystone Service List"
+keystone service-list
+EOI
+  fi
 }
 
 ##Post configuration after install
@@ -928,6 +938,7 @@ display_usage() {
   echo -e "   --no-ha : disable High Availability deployment scheme, this assumes a single controller and single compute node \n"
   echo -e "   --flat : disable Network Isolation and use a single flat network for the underlay network.\n"
   echo -e "   --no-post-config : disable Post Install configuration."
+  echo -e "   --debug : enable debug output."
 }
 
 ##translates the command line parameters into variables
@@ -994,6 +1005,11 @@ parse_cmdline() {
                 echo "Post install configuration disabled"
                 shift 1
             ;;
+        --debug )
+                debug="TRUE"
+                echo "Enable debug output"
+                shift 1
+            ;;
         *)
                 display_usage
                 exit 1
-- 
cgit 1.2.3-korg