openstack/deb-murano
Code Issues Proposed changes

Fix murano devstack libs and plugin

Browse Source 
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
This commit is contained in:
Victor Ryzhenkin 2015-09-04 13:55:40 +03:00
parent c9eff7b090
commit b1fc727e73
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/devstack/lib/murano
View File

@ -91,16 +91,22 @@ function create_murano_accounts() {
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
MURANO_SERVICE=$(openstack service create \ MURANO_SERVICE=$(openstack service create \
murano \ application_catalog \
--type=application_catalog \ --name=murano \
--description="Application Catalog" \ --description="Application Catalog" \
| grep " id " | get_field 2) | grep " id " | get_field 2)
openstack endpoint create \ openstack endpoint create \
$MURANO_SERVICE \ $MURANO_SERVICE \
--region RegionOne \ public "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
--publicurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ --region RegionOne
--adminurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ openstack endpoint create \
--internalurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" $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 fi
} }

18
devstack/plugin.sh
View File

@ -87,16 +87,22 @@ function create_murano_accounts() {
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
MURANO_SERVICE=$(openstack service create \ MURANO_SERVICE=$(openstack service create \
murano \ application_catalog \
--type=application_catalog \ --name=murano \
--description="Application Catalog" \ --description="Application Catalog" \
| grep " id " | get_field 2) | grep " id " | get_field 2)
openstack endpoint create \ openstack endpoint create \
$MURANO_SERVICE \ $MURANO_SERVICE \
--region RegionOne \ public "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
--publicurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ --region RegionOne
--adminurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \ openstack endpoint create \
--internalurl "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" $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 fi
} }