diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-06 20:54:44 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-07 11:11:19 -0400 |
| commit | 3c080f9e62ffc6c75c64ba0d86167fbeb2d83a35 (patch) | |
| tree | 82291ec4f97a96f600b67afcf3e128efd4fc2a4c /docker/keystone | |
| parent | 068face6fa52d19d421913b9969b291500a39c6d (diff) | |
| download | kolla-3c080f9e62ffc6c75c64ba0d86167fbeb2d83a35.tar.gz kolla-3c080f9e62ffc6c75c64ba0d86167fbeb2d83a35.zip | |
renamed keystone services
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
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone-admin-service.json (renamed from docker/keystone/keystone-service-35357.json) | 4 | ||||
| -rw-r--r-- | docker/keystone/keystone-public-service.json (renamed from docker/keystone/keystone-service-5000.json) | 4 | ||||
| -rw-r--r-- | docker/keystone/keystone.json | 2 | ||||
| -rwxr-xr-x | docker/keystone/start.sh | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/docker/keystone/keystone-service-35357.json b/docker/keystone/keystone-admin-service.json index a78ba8fb3..c67d58553 100644 --- a/docker/keystone/keystone-service-35357.json +++ b/docker/keystone/keystone-admin-service.json @@ -1,10 +1,10 @@ { - "id": "keystonemaster-35357", + "id": "keystone-admin", "kind": "Service", "apiVersion": "v1beta1", "port": 35357, "containerPort": 35357, "selector": { - "name": "keystone-master" + "name": "keystone" } } diff --git a/docker/keystone/keystone-service-5000.json b/docker/keystone/keystone-public-service.json index d908bcca9..6768fe9e0 100644 --- a/docker/keystone/keystone-service-5000.json +++ b/docker/keystone/keystone-public-service.json @@ -1,10 +1,10 @@ { - "id": "keystonemaster-5000", + "id": "keystone-public", "kind": "Service", "apiVersion": "v1beta1", "port": 5000, "containerPort": 5000, "selector": { - "name": "keystone-master" + "name": "keystone" } } diff --git a/docker/keystone/keystone.json b/docker/keystone/keystone.json index 024cc4022..4a1edf0db 100644 --- a/docker/keystone/keystone.json +++ b/docker/keystone/keystone.json @@ -19,6 +19,6 @@ } }, "labels": { - "name": "keystone-master" + "name": "keystone" } } diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index a825c39d8..b00667691 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -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 |