openstack/kolla-ansible
Code Issues Proposed changes

renamed keystone services

Browse Source 
This renames the keystone services so that they are named by function,
rather than port number (which would be confusing if they were running
on a different port).

Change-Id: Ibb0263a133c28a104563df431870a9effe584012
This commit is contained in:
Lars Kellogg-Stedman 2014-10-06 20:54:44 -04:00
parent 068face6fa
commit 3c080f9e62
12 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/cinder/start.sh
View File

@ -143,7 +143,7 @@ crudini --set /etc/cinder/cinder.conf \
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
/bin/keystone user-create --name ${CINDER_KEYSTONE_USER} --pass ${CINDER_ADMIN_PASSWORD}
/bin/keystone role-create --name ${CINDER_KEYSTONE_USER}

2
docker/glance/glance-base/config-glance.sh
View File

@ -33,7 +33,7 @@ done
crudini --set $cfg
keystone_authtoken \
auth_uri \
"${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_5000_PORT_5000_TCP_ADDR}:5000/"
"${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_PORT_5000_TCP_ADDR}:5000/"
crudini --set $cfg
keystone_authtoken \
admin_tenant_name \

2
docker/glance/glance-registry/start.sh
View File

@ -33,7 +33,7 @@ EOF
/usr/bin/glance-manage db_sync
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
/usr/bin/keystone user-create --name ${GLANCE_KEYSTONE_USER} --pass ${GLANCE_KEYSTONE_PASS}
/usr/bin/keystone user-role-add --user ${GLANCE_KEYSTONE_USER} --role admin --tenant ${GLANCE_TENANT_NAME}

2
docker/heat/heat-engine/start.sh
View File

@ -31,7 +31,7 @@ GRANT ALL PRIVILEGES ON heat* TO
EOF
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
/bin/keystone user-create --name ${GLANCE_KEYSTONE_USER} --pass ${GLANCE_ADMIN_PASSWORD}
/bin/keystone role-create --name ${GLANCE_KEYSTONE_USER}

4
docker/keystone/keystone-service-35357.json → docker/keystone/keystone-admin-service.json
View File

@ -1,10 +1,10 @@
{
"id": "keystonemaster-35357",
"id": "keystone-admin",
"kind": "Service",
"apiVersion": "v1beta1",
"port": 35357,
"containerPort": 35357,
"selector": {
"name": "keystone-master"
"name": "keystone"
}
}

4
docker/keystone/keystone-service-5000.json → docker/keystone/keystone-public-service.json
View File

@ -1,10 +1,10 @@
{
"id": "keystonemaster-5000",
"id": "keystone-public",
"kind": "Service",
"apiVersion": "v1beta1",
"port": 5000,
"containerPort": 5000,
"selector": {
"name": "keystone-master"
"name": "keystone"
}
}

2
docker/keystone/keystone.json
View File

@ -19,6 +19,6 @@
}
},
"labels": {
"name": "keystone-master"
"name": "keystone"
}
}

12
docker/keystone/start.sh
View File

@ -45,11 +45,11 @@ cat /etc/keystone/keystone.conf
MY_IP=$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
awk '$4 == "src" {print $5}')
if [ -z "$KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR" ]; then
KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR=$MY_IP
if [ -z "$KEYSTONE_ADMIN_PORT_35357_TCP_ADDR" ]; then
KEYSTONE_ADMIN_PORT_35357_TCP_ADDR=$MY_IP
fi
if [ -z "$KEYSTONEMASTER_5000_PORT_5000_TCP_ADDR" ]; then
KEYSTONEMASTER_5000_PORT_5000_TCP_ADDR=$MY_IP
if [ -z "$KEYSTONE_PUBLIC_PORT_5000_TCP_ADDR" ]; then
KEYSTONE_PUBLIC_PORT_5000_TCP_ADDR=$MY_IP
fi
/usr/bin/keystone-all &
@ -57,8 +57,8 @@ PID=$!
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="http://127.0.0.1:35357/v2.0"
SERVICE_ENDPOINT_ADMIN="http://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
SERVICE_ENDPOINT_USER="http://${KEYSTONEMASTER_5000_PORT_5000_TCP_ADDR}:5000/v2.0"
SERVICE_ENDPOINT_ADMIN="http://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
SERVICE_ENDPOINT_USER="http://${KEYSTONE_PUBLIC_PORT_5000_TCP_ADDR}:5000/v2.0"
# wait for keystone to become active
while ! curl -o /dev/null -s --fail ${SERVICE_ENDPOINT}; do

2
docker/nova-compute/nova-compute/start.sh
View File

@ -31,7 +31,7 @@ GRANT ALL PRIVILEGES ON nova* TO
EOF
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
/usr/bin/keystone user-create --name ${NOVA_KEYSTONE_USER} --pass ${NOVA_ADMIN_PASSWORD}
/usr/bin/keystone role-create --name ${NOVA_KEYSTONE_USER}

2
docker/swift/swift-account/start.sh
View File

@ -31,7 +31,7 @@ GRANT ALL PRIVILEGES ON swift* TO
EOF
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
/bin/keystone user-create --name ${SWIFT_KEYSTONE_USER} --pass ${SWIFT_ADMIN_PASSWORD}
/bin/keystone role-create --name ${SWIFT_KEYSTONE_USER}

2
docker/swift/swift-container/start.sh
View File

@ -31,7 +31,7 @@ GRANT ALL PRIVILEGES ON swift* TO
EOF
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
/bin/keystone user-create --name ${SWIFT_KEYSTONE_USER} --pass ${SWIFT_ADMIN_PASSWORD}
/bin/keystone role-create --name ${SWIFT_KEYSTONE_USER}

2
docker/swift/swift-object/start.sh
View File

@ -31,7 +31,7 @@ GRANT ALL PRIVILEGES ON swift* TO
EOF
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
/bin/keystone user-create --name ${SWIFT_KEYSTONE_USER} --pass ${SWIFT_ADMIN_PASSWORD}
/bin/keystone role-create --name ${SWIFT_KEYSTONE_USER}