From b1fc727e730649d76fa542e07189f03ba9d52329 Mon Sep 17 00:00:00 2001 From: Victor Ryzhenkin Date: Fri, 4 Sep 2015 13:55:40 +0300 Subject: [PATCH] Fix murano devstack libs and plugin The root cause of the problem is deprecation of multiple options in python-openstackclient This patch fixes endpoint creation and service creation in devstack-related libs and plugin Change-Id: I4b1e5388b3321b77146bfcec7219ca5331b70b84 Closes-Bug: #1492209 --- contrib/devstack/lib/murano | 18 ++++++++++++------ devstack/plugin.sh | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/contrib/devstack/lib/murano b/contrib/devstack/lib/murano index 22bddb91..81d42f8f 100644 --- a/contrib/devstack/lib/murano +++ b/contrib/devstack/lib/murano @@ -91,16 +91,22 @@ function create_murano_accounts() { if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then MURANO_SERVICE=$(openstack service create \ - murano \ - --type=application_catalog \ + application_catalog \ + --name=murano \ --description="Application Catalog" \ | grep " id " | get_field 2) openstack endpoint create \ $MURANO_SERVICE \ - --region RegionOne \ - --publicurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ - --adminurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ - --internalurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" + public "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ + --region RegionOne + openstack endpoint create \ + $MURANO_SERVICE \ + admin "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ + --region RegionOne + openstack endpoint create \ + $MURANO_SERVICE \ + internal "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ + --region RegionOne fi } diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 456311bf..1d688280 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -87,16 +87,22 @@ function create_murano_accounts() { if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then MURANO_SERVICE=$(openstack service create \ - murano \ - --type=application_catalog \ + application_catalog \ + --name=murano \ --description="Application Catalog" \ | grep " id " | get_field 2) openstack endpoint create \ $MURANO_SERVICE \ - --region RegionOne \ - --publicurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ - --adminurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ - --internalurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" + public "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ + --region RegionOne + openstack endpoint create \ + $MURANO_SERVICE \ + admin "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ + --region RegionOne + openstack endpoint create \ + $MURANO_SERVICE \ + internal "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ + --region RegionOne fi }