diff options
| author |   Dimitri Mazmanov <dimitri.mazmanov@ericsson.com> | 2017-01-31 14:16:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-31 14:16:01 +0000 |
| commit | a45633054f93a24401847c3a54e88e9a3344250a (patch) | |
| tree | 0e93eb5f0f6489442d3aa290d8c3a9f212ba43b4 | |
| parent | 7de25e1f3e93cc4b95b3f343b05a057d42fc86cb (diff) | |
| parent | 2158e3907e717fde2effd425bd4639e438db8440 (diff) | |
Merge "Fix internal url"
| -rwxr-xr-x | tools/keystone/endpoint.sh | 2 | ||||
| -rwxr-xr-x | 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() { |