From 2158e3907e717fde2effd425bd4639e438db8440 Mon Sep 17 00:00:00 2001
From: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com>
Date: Tue, 31 Jan 2017 14:54:04 +0100
Subject: Fix internal url

Change-Id: I6da6bb329bb54de6f58ae1ba9082973dd00475a0
Signed-off-by: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com>
---
 tools/keystone/endpoint.sh  |  2 +-
 tools/keystone/writepass.sh | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/keystone/endpoint.sh b/tools/keystone/endpoint.sh
index d55d4bd..2992e1a 100755
--- a/tools/keystone/endpoint.sh
+++ b/tools/keystone/endpoint.sh
@@ -28,6 +28,6 @@ cat > ${ENDPOINT_FILE} <<EOT
 [DEFAULT]
 public_url=${ENDPOINT_PUBLIC_URL}
 admin_url=${ENDPOINT_ADMIN_URL}
-private_url=${ENDPOINT_INTERNAL_URL}
+internal_url=${ENDPOINT_INTERNAL_URL}
 os_region=RegionTwo
 EOT
diff --git a/tools/keystone/writepass.sh b/tools/keystone/writepass.sh
index c4ce244..965529c 100755
--- a/tools/keystone/writepass.sh
+++ b/tools/keystone/writepass.sh
@@ -72,16 +72,16 @@ function decode_passwords() {
 
 function write_controller() {
     # For each slave region the following files must be updated on each controller.
-    iniset "/etc/glance/glance-registry.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT glance_password)
-    iniset "/etc/glance/glance-api.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT glance_password)
-    iniset "/etc/glance/glance-glare.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT glare_password)
-    iniset "/etc/heat/heat.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT heat_password)
-    iniset "/etc/nova/nova.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT nova_password)
-    iniset "/etc/nova/nova.conf" neutron password $(iniget ${PASSWORD_FILE} DEFAULT neutron_password)
-    iniset "/etc/cinder/cinder.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT cinder_password)
-    iniset "/etc/neutron/neutron.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT neutron_password)
-    iniset "/etc/ceilometer/ceilometer.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT ceilometer_password)
-    iniset "/etc/aodh/aodh.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT aodh_password)
+    iniset "/etc/glance/glance-registry.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT glance)
+    iniset "/etc/glance/glance-api.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT glance)
+    iniset "/etc/glance/glance-glare.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT glare)
+    iniset "/etc/heat/heat.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT heat)
+    iniset "/etc/nova/nova.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT nova)
+    iniset "/etc/nova/nova.conf" neutron password $(iniget ${PASSWORD_FILE} DEFAULT neutron)
+    iniset "/etc/cinder/cinder.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT cinder)
+    iniset "/etc/neutron/neutron.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT neutron)
+    iniset "/etc/ceilometer/ceilometer.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT ceilometer)
+    iniset "/etc/aodh/aodh.conf" keystone_authtoken password $(iniget ${PASSWORD_FILE} DEFAULT aodh)
 }
 
 function restart_controller() {
@@ -109,7 +109,7 @@ function restart_controller() {
 }
 
 function write_compute() {
-    iniset "/etc/nova/nova.conf" neutron password $(iniget ${PASSWORD_FILE} DEFAULT neutron_password)
+    iniset "/etc/nova/nova.conf" neutron password $(iniget ${PASSWORD_FILE} DEFAULT neutron)
 }
 
 function restart_compute() {
-- 
cgit 1.2.3-korg