From: Feng Pan <fpan@redhat.com>
Date: Mon, 13 Jun 2016 14:53:42 +0000 (-0400)
Subject: Change keystone CLI to OSC
X-Git-Tag: colorado.1.0~176^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=938a1d630f171b1fccc229c5886b71c7fd2308ab;p=apex.git

Change keystone CLI to OSC

Change-Id: I24934e4fde9037a5f625fe4100799390937f4016
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 7c07ae63..f5fb1314 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1004,9 +1004,9 @@ EOI
       ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
 source overcloudrc
 echo "Keystone Endpoint List:"
-keystone endpoint-list
+openstack endpoint list
 echo "Keystone Service List"
-keystone service-list
+openstack service list
 cinder quota-show \$(openstack project list | grep admin | awk {'print \$2'})
 EOI
   fi
@@ -1024,14 +1024,14 @@ function configure_post_install {
 source overcloudrc
 set -o errexit
 echo "Configuring Neutron external network"
-neutron net-create external --router:external=True --tenant-id \$(keystone tenant-get service | grep id | awk '{ print \$4 }')
-neutron subnet-create --name external-net --tenant-id \$(keystone tenant-get service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr}
+neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }')
+neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr}
 
 echo "Removing swift endpoint and service"
-swift_service_id=\$(keystone service-list | grep swift | cut -d ' ' -f 2)
-swift_endpoint_id=\$(keystone endpoint-list | grep \$swift_service_id | cut -d ' ' -f 2)
-keystone endpoint-delete \$swift_endpoint_id
-keystone service-delete \$swift_service_id
+swift_service_id=\$(openstack service list | grep swift | cut -d ' ' -f 2)
+swift_endpoint_id=\$(openstack endpoint list | grep swift | cut -d ' ' -f 2)
+openstack endpoint delete \$swift_endpoint_id
+openstack service delete \$swift_service_id
 EOI
 
   echo -e "${blue}INFO: Checking if OVS bridges have IP addresses...${reset}"