Merge "Changes default port from 8888 to 8889"

This commit is contained in:
Jenkins 2016-06-29 15:24:49 +00:00 committed by Gerrit Code Review
commit 9a26753b3b
6 changed files with 27 additions and 27 deletions
cloudkitty/api
contrib/ci/scripts
devstack
doc/source
etc/cloudkitty

View File

@ -49,7 +49,7 @@ api_opts = [
default="0.0.0.0",
help='Host serving the API.'),
cfg.PortOpt('port',
default=8888,
default=8889,
help='Host port serving the API.'),
cfg.BoolOpt('pecan_debug',
default=False,

View File

@ -43,7 +43,7 @@ class APILink(wtypes.Base):
sample = cls(
rel='self',
type='text/html',
href='http://127.0.0.1:8888/{id}'.format(
href='http://127.0.0.1:8889/{id}'.format(
id=version))
return sample

View File

@ -4,11 +4,11 @@ show_state()
{
echo ''
echo 'Show ceilometer state:'
echo "GET http://localhost:8888/v1/collector/ceilometer/state"
curl "http://localhost:8888/v1/collector/ceilometer/state"
echo "GET http://localhost:8889/v1/collector/ceilometer/state"
curl "http://localhost:8889/v1/collector/ceilometer/state"
echo ''
echo "GET http://localhost:8888/v1/collector/state/ceilometer"
curl "http://localhost:8888/v1/collector/state/ceilometer"
echo "GET http://localhost:8889/v1/collector/state/ceilometer"
curl "http://localhost:8889/v1/collector/state/ceilometer"
echo ''
}
@ -16,13 +16,13 @@ set_state()
{
echo ''
echo 'Set ceilometer state:'
echo "PUT http://localhost:8888/v1/collector/ceilometer/state"
curl "http://localhost:8888/v1/collector/ceilometer/state" \
echo "PUT http://localhost:8889/v1/collector/ceilometer/state"
curl "http://localhost:8889/v1/collector/ceilometer/state" \
-X PUT -H "Content-Type: application/json" -H "Accept: application/json" \
-d '{"enabled": true}'
echo ''
echo "PUT http://localhost:8888/v1/collector/state/ceilometer"
curl "http://localhost:8888/v1/collector/state/ceilometer" \
echo "PUT http://localhost:8889/v1/collector/state/ceilometer"
curl "http://localhost:8889/v1/collector/state/ceilometer" \
-X PUT -H "Content-Type: application/json" -H "Accept: application/json" \
-d '{"enabled": false}'
echo ''
@ -32,13 +32,13 @@ list_mappings()
{
echo ''
echo 'Get compute mapping:'
echo "GET http://localhost:8888/v1/collector/mappings/compute"
curl "http://localhost:8888/v1/collector/mappings/compute"
echo "GET http://localhost:8889/v1/collector/mappings/compute"
curl "http://localhost:8889/v1/collector/mappings/compute"
echo ''
echo 'List ceilometer mappings:'
echo "GET http://localhost:8888/v1/collector/ceilometer/mappings"
curl "http://localhost:8888/v1/collector/ceilometer/mappings"
echo "GET http://localhost:8889/v1/collector/ceilometer/mappings"
curl "http://localhost:8889/v1/collector/ceilometer/mappings"
echo ''
}
@ -46,14 +46,14 @@ set_mappings()
{
echo ''
echo 'Set compute to ceilometer mapping:'
echo "POST http://localhost:8888/v1/collector/ceilometer/mappings/compute"
curl "http://localhost:8888/v1/collector/ceilometer/mappings/compute" \
echo "POST http://localhost:8889/v1/collector/ceilometer/mappings/compute"
curl "http://localhost:8889/v1/collector/ceilometer/mappings/compute" \
-X POST -H "Content-Type: application/json" -H "Accept: application/json" \
-d ''
echo ''
echo 'Set volume to ceilometer mapping:'
echo "POST http://localhost:8888/v1/collector/mappings?collector=ceilometer&service=volume"
curl "http://localhost:8888/v1/collector/mappings?collector=ceilometer&service=volume" \
echo "POST http://localhost:8889/v1/collector/mappings?collector=ceilometer&service=volume"
curl "http://localhost:8889/v1/collector/mappings?collector=ceilometer&service=volume" \
-X POST -H "Content-Type: application/json" -H "Accept: application/json" \
-d ''
echo ''
@ -63,14 +63,14 @@ del_mappings()
{
echo ''
echo 'Deleting compute to ceilometer mapping:'
echo "DELETE http://localhost:8888/v1/collector/ceilometer/mappings/compute"
curl "http://localhost:8888/v1/collector/ceilometer/mappings/compute" \
echo "DELETE http://localhost:8889/v1/collector/ceilometer/mappings/compute"
curl "http://localhost:8889/v1/collector/ceilometer/mappings/compute" \
-X DELETE -H "Content-Type: application/json" -H "Accept: application/json" \
-d ''
test $? && echo 'OK'
echo 'Deleting volume to ceilometer mapping:'
echo "DELETE http://localhost:8888/v1/collector/mappings?collector=ceilometer&service=volume"
curl "http://localhost:8888/v1/collector/mappings?collector=ceilometer&service=volume" \
echo "DELETE http://localhost:8889/v1/collector/mappings?collector=ceilometer&service=volume"
curl "http://localhost:8889/v1/collector/mappings?collector=ceilometer&service=volume" \
-X DELETE -H "Content-Type: application/json" -H "Accept: application/json" \
-d ''
test $? && echo 'OK'

View File

@ -29,7 +29,7 @@ CLOUDKITTY_BRANCH=${CLOUDKITTY_BRANCH:-master}
# Set CloudKitty connection info
CLOUDKITTY_SERVICE_HOST=${CLOUDKITTY_SERVICE_HOST:-$SERVICE_HOST}
CLOUDKITTY_SERVICE_PORT=${CLOUDKITTY_SERVICE_PORT:-8888}
CLOUDKITTY_SERVICE_PORT=${CLOUDKITTY_SERVICE_PORT:-8889}
CLOUDKITTY_SERVICE_HOSTPORT="$CLOUDKITTY_SERVICE_HOST:$CLOUDKITTY_SERVICE_PORT"
CLOUDKITTY_SERVICE_PROTOCOL=${CLOUDKITTY_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}

View File

@ -203,9 +203,9 @@ Create the ``rating`` service and its endpoints:
keystone service-create --name CloudKitty --type rating
keystone endpoint-create --service-id RATING_SERVICE_ID \
--publicurl http://localhost:8888 \
--adminurl http://localhost:8888 \
--internalurl http://localhost:8888
--publicurl http://localhost:8889 \
--adminurl http://localhost:8889 \
--internalurl http://localhost:8889
Start CloudKitty
================

View File

@ -101,7 +101,7 @@
#host_ip = 0.0.0.0
# Host port serving the API. (integer value)
#port = 8888
#port = 8889
[collect]