openstack/training-guides
Code Issues Proposed changes

Merge "labs: use hostname_to_ip where appropriate"

Browse Source
This commit is contained in:
Jenkins 2014-09-14 08:33:18 +00:00 committed by Gerrit Code Review
commit 5a578d6ca4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
labs/scripts/setup_neutron_network.sh
View File

@ -117,7 +117,7 @@ iniset_sudo $conf DEFAULT auth_region regionOne
iniset_sudo $conf DEFAULT admin_tenant_name "$SERVICE_TENANT_NAME"
iniset_sudo $conf DEFAULT admin_user "$neutron_admin_user"
iniset_sudo $conf DEFAULT admin_password "$neutron_admin_password"
iniset_sudo $conf DEFAULT nova_metadata_ip controller-mgmt
iniset_sudo $conf DEFAULT nova_metadata_ip "$(hostname_to_ip controller-mgmt)"
iniset_sudo $conf DEFAULT metadata_proxy_shared_secret "$METADATA_SECRET"
echo "Configuring the DHCP agent"

2
labs/scripts/setup_nova_compute.sh
View File

@ -54,7 +54,7 @@ iniset_sudo $conf DEFAULT rabbit_host controller-mgmt
iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
# Configure other variables
iniset_sudo $conf DEFAULT my_ip compute-mgmt
iniset_sudo $conf DEFAULT my_ip "$(hostname_to_ip compute-mgmt)"
iniset_sudo $conf DEFAULT vncserver_listen 0.0.0.0
iniset_sudo $conf DEFAULT vnc_enabled True
iniset_sudo $conf DEFAULT vncserver_proxyclient_address compute-mgmt

2
labs/scripts/setup_nova_controller.sh
View File

@ -62,7 +62,7 @@ iniset_sudo $conf DEFAULT rabbit_host controller-mgmt
iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
# Configure other variables
iniset_sudo $conf DEFAULT my_ip controller-mgmt
iniset_sudo $conf DEFAULT my_ip "$(hostname_to_ip controller-mgmt)"
iniset_sudo $conf DEFAULT vncserver_listen controller-mgmt
iniset_sudo $conf DEFAULT vncserver_proxyclient_address controller-mgmt
iniset_sudo $conf DEFAULT auth_strategy keystone