From 3b4a1929df66391eb44785946369eb462738c5a6 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 8 Oct 2015 11:43:57 -0500 Subject: [PATCH] Fix to correctly set the nova_management_address This change sets the nova management address based on the facts the play is able to set about the environment. This will correct configure the nova to use a specific management network which is not always the default container address. Closes-Bug: #1504226 Change-Id: Ib6d84072d379118ebfc560f4594c28e1fecf3b40 Signed-off-by: Kevin Carter --- templates/nova.conf.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index f47043be..a3d4c649 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -68,7 +68,7 @@ ec2_dmz_host = {{ external_lb_vip_address }} {% endif %} {% if nova_s3_deprecated_but_enabled == true or nova_s3_deprecated_but_enabled == 'True' %} s3_port = {{ nova_s3_service_port }} -s3_host = {{ ansible_ssh_host }} +s3_host = {{ nova_management_address }} {% endif %} # Rpc all @@ -87,7 +87,7 @@ dhcp_domain = {{ nova_dhcp_domain }} force_dhcp_release = True dhcpbridge_flagfile = /etc/nova/nova.conf firewall_driver = {{ nova_firewall_driver }} -my_ip = {{ ansible_ssh_host }} +my_ip = {{ nova_management_address }} default_floating_pool = public security_group_api = neutron network_api_class = nova.network.neutronv2.api.API @@ -135,8 +135,8 @@ enabled = {{ nova_console_agent_enabled }} keymap = {{ nova_console_keymap }} # Console Url and binds html5proxy_base_url = {{ nova_spice_html5proxy_base_url }} -server_listen = {{ ansible_ssh_host }} -server_proxyclient_address = {{ ansible_ssh_host }} +server_listen = {{ nova_management_address }} +server_proxyclient_address = {{ nova_management_address }} {% elif nova_console_type == 'novnc' %} [vnc]