Merge "Simplify endpoints created by devstack plugin"
This commit is contained in:
commit
89dbf28e8a
|
@ -60,7 +60,7 @@ Configure masakari-api
|
|||
|
||||
.. code-block:: shell-session
|
||||
|
||||
openstack endpoint create --region RegionOne masakari --publicurl http://<ip-address>:<port>/v1/%\(tenant_id\)s --adminurl http://<ip-address>:<port>/v1/%\(tenant_id\)s --internalurl http://<ip-address>:<port>/v1/%\(tenant_id\)s
|
||||
openstack endpoint create --region RegionOne masakari --publicurl http://<ip-address>:<port>/v1/%\(tenant_id\)s
|
||||
|
||||
#. Clone masakari using
|
||||
|
||||
|
|
|
@ -69,14 +69,10 @@ function create_masakari_accounts {
|
|||
if [ "$MASAKARI_USE_MOD_WSGI" == "False" ]; then
|
||||
get_or_create_endpoint $masakari_service \
|
||||
"$REGION_NAME" \
|
||||
"$MASAKARI_SERVICE_PROTOCOL://$SERVICE_HOST:$MASAKARI_SERVICE_PORT/v1/\$(tenant_id)s" \
|
||||
"$MASAKARI_SERVICE_PROTOCOL://$SERVICE_HOST:$MASAKARI_SERVICE_PORT/v1/\$(tenant_id)s" \
|
||||
"$MASAKARI_SERVICE_PROTOCOL://$SERVICE_HOST:$MASAKARI_SERVICE_PORT/v1/\$(tenant_id)s"
|
||||
else
|
||||
get_or_create_endpoint $masakari_service \
|
||||
"$REGION_NAME" \
|
||||
"$MASAKARI_SERVICE_PROTOCOL://$SERVICE_HOST/instance-ha/v1/\$(tenant_id)s" \
|
||||
"$MASAKARI_SERVICE_PROTOCOL://$SERVICE_HOST/instance-ha/v1/\$(tenant_id)s" \
|
||||
"$MASAKARI_SERVICE_PROTOCOL://$SERVICE_HOST/instance-ha/v1/\$(tenant_id)s"
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue