diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-26 07:01:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-26 07:01:12 +0000 |
| commit | 1fcf0bee5fbf455c547db6bd4a581680faf303a8 (patch) | |
| tree | dfd9e057b9846fa75b37afcc576e5c5b6aa49d59 | |
| parent | 31e4fa1937639dd538f2c07d123d972104475cf4 (diff) | |
| parent | 1950051b66d33ac1e212de4858f7c9a09e889d6d (diff) | |
| download | kolla-1fcf0bee5fbf455c547db6bd4a581680faf303a8.tar.gz kolla-1fcf0bee5fbf455c547db6bd4a581680faf303a8.zip | |
Merge "Prefer the use PUBLIC_IP over MY_IP"
| -rwxr-xr-x | docker/keystone/start.sh | 2 | ||||
| -rwxr-xr-x | 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 5c1cef5ae..afa04ed66 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -49,7 +49,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 359468e92..15ab7870c 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 |