openstack
/
mistral
Code Issues Proposed changes

Get rid of v1 in installation scripts 

Change-Id: I03999ce66d1890ec7bdba3a331fa8df7e09e1ea2
This commit is contained in:
Anastasia Kuznetsova 2015-04-08 12:12:18 +03:00 committed by Renat Akhmerov
parent 01b1f05b33
commit 5d988122be
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/devstack/lib/mistral
View File

@ -73,18 +73,6 @@ function create_mistral_accounts {
--user $MISTRAL_USER
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
MISTRAL_SERVICE=$(openstack service create \
mistral \
--type=workflow \
--description="Workflow Service" \
| grep " id " | get_field 2)
openstack endpoint create \
$MISTRAL_SERVICE \
--region RegionOne \
--publicurl "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v1" \
--adminurl "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v1" \
--internalurl "$MISTRAL_SERVICE_PROTOCOL://$MISTRAL_SERVICE_HOST:$MISTRAL_SERVICE_PORT/v1"
MISTRAL_SERVICE_V2=$(openstack service create \
mistral \
--type=workflowv2 \

2
functionaltests/run_tests.sh
View File

@ -15,7 +15,7 @@
# How many seconds to wait for the API to be responding before giving up
API_RESPONDING_TIMEOUT=20
if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:8989/v1/ 2>/dev/null | grep -q 'Authentication required' ; do sleep 1; done"; then
if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:8989/v2/ 2>/dev/null | grep -q 'Authentication required' ; do sleep 1; done"; then
echo "Mistral API failed to respond within ${API_RESPONDING_TIMEOUT} seconds"
exit 1
fi