From 3c080f9e62ffc6c75c64ba0d86167fbeb2d83a35 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Mon, 6 Oct 2014 20:54:44 -0400
Subject: 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
---
 docker/keystone/keystone-admin-service.json  | 10 ++++++++++
 docker/keystone/keystone-public-service.json | 10 ++++++++++
 docker/keystone/keystone-service-35357.json  | 10 ----------
 docker/keystone/keystone-service-5000.json   | 10 ----------
 docker/keystone/keystone.json                |  2 +-
 docker/keystone/start.sh                     | 12 ++++++------
 6 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 docker/keystone/keystone-admin-service.json
 create mode 100644 docker/keystone/keystone-public-service.json
 delete mode 100644 docker/keystone/keystone-service-35357.json
 delete mode 100644 docker/keystone/keystone-service-5000.json

(limited to 'docker/keystone')

diff --git a/docker/keystone/keystone-admin-service.json b/docker/keystone/keystone-admin-service.json
new file mode 100644
index 000000000..c67d58553
--- /dev/null
+++ b/docker/keystone/keystone-admin-service.json
@@ -0,0 +1,10 @@
+{
+  "id": "keystone-admin",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
+  "port": 35357,
+  "containerPort": 35357,
+  "selector": {
+    "name": "keystone"
+  }
+}
diff --git a/docker/keystone/keystone-public-service.json b/docker/keystone/keystone-public-service.json
new file mode 100644
index 000000000..6768fe9e0
--- /dev/null
+++ b/docker/keystone/keystone-public-service.json
@@ -0,0 +1,10 @@
+{
+  "id": "keystone-public",
+  "kind": "Service",
+  "apiVersion": "v1beta1",
+  "port": 5000,
+  "containerPort": 5000,
+  "selector": {
+    "name": "keystone"
+  }
+}
diff --git a/docker/keystone/keystone-service-35357.json b/docker/keystone/keystone-service-35357.json
deleted file mode 100644
index a78ba8fb3..000000000
--- a/docker/keystone/keystone-service-35357.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "keystonemaster-35357",
-  "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 35357,
-  "containerPort": 35357,
-  "selector": {
-    "name": "keystone-master"
-  }
-}
diff --git a/docker/keystone/keystone-service-5000.json b/docker/keystone/keystone-service-5000.json
deleted file mode 100644
index d908bcca9..000000000
--- a/docker/keystone/keystone-service-5000.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "keystonemaster-5000",
-  "kind": "Service",
-  "apiVersion": "v1beta1",
-  "port": 5000,
-  "containerPort": 5000,
-  "selector": {
-    "name": "keystone-master"
-  }
-}
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
-- 
cgit v1.2.3