From 1950051b66d33ac1e212de4858f7c9a09e889d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Mon, 1 Dec 2014 15:05:28 +0900 Subject: [PATCH] Prefer the use PUBLIC_IP over MY_IP PUBLIC_IP is more descriptive that MY_IP, it should be used consistently across Kolla. Change-Id: Iff6ae903e794ec84a40a300b36512422b7a81f71 --- docker/keystone/start.sh | 2 +- docker/nova-base/config-nova.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index d7e494f83a..e7200d8b41 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -48,7 +48,7 @@ EOF PID=$! export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="http://${MY_IP}:35357/v2.0" +export SERVICE_ENDPOINT="http://${PUBLIC_IP}:35357/v2.0" while ! curl -o /dev/null -s --fail ${SERVICE_ENDPOINT}; do echo "waiting for keystone @ ${SERVICE_ENDPOINT}" diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 359468e921..15ab7870cf 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -39,7 +39,7 @@ crudini --set $cfg DEFAULT use_forwarded_for False crudini --set $cfg DEFAULT novncproxy_host 0.0.0.0 crudini --set $cfg DEFAULT novncproxy_port 6080 crudini --set $cfg DEFAULT glance_api_servers ${GLANCE_API_SERVICE_HOST}:9292 -crudini --set $cfg DEFAULT metadata_host ${MY_IP} +crudini --set $cfg DEFAULT metadata_host ${PUBLIC_IP} crudini --set $cfg DEFAULT cpu_allocation_ratio 16.0 crudini --set $cfg DEFAULT ram_allocation_ratio 1.5 crudini --set $cfg DEFAULT scheduler_default_filters RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter @@ -48,7 +48,7 @@ crudini --set $cfg DEFAULT vif_plugging_is_fatal True crudini --set $cfg DEFAULT vif_plugging_timeout 300 crudini --set $cfg DEFAULT novncproxy_base_url http://${PUBLIC_IP}:6080/vnc_auto.html crudini --set $cfg DEFAULT vncserver_listen 0.0.0.0 -crudini --set $cfg DEFAULT vncserver_proxyclient_address ${MY_IP} +crudini --set $cfg DEFAULT vncserver_proxyclient_address ${PUBLIC_IP} crudini --set $cfg DEFAULT vnc_enabled True crudini --set $cfg DEFAULT volume_api_class nova.volume.cinder.API crudini --set $cfg DEFAULT image_service nova.image.glance.GlanceImageService