openstack/openstack-ansible
Code Issues Proposed changes

Merge "Fix to correctly set the nova_management_address"

Browse Source
This commit is contained in:
Jenkins 2015-10-15 04:00:08 +00:00 committed by Gerrit Code Review
commit 462365a3c3
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
playbooks/os-nova-install.yml
View File

@ -112,6 +112,45 @@
when: is_metal | bool
tags:
- nova-logs
- name: Set nova management bridge (is_metal)
set_fact:
management_bridge: "{{ 'ansible_' + hostvars[inventory_hostname]['container_networks']['container_address']['bridge'] | replace('-', '_') }}"
when:
- hostvars[inventory_hostname]['container_networks']['container_address']['bridge'] is defined
- is_metal | bool
tags:
- nova-config
- name: Set nova management address (is_metal)
set_fact:
management_address: "{{ hostvars[inventory_hostname][management_bridge]['ipv4']['address'] }}"
when:
- is_metal | bool
tags:
- nova-config
- name: Set nova management bridge (is_metal no container network)
set_fact:
management_address: "{{ ansible_ssh_host }}"
when:
- hostvars[inventory_hostname]['container_networks']['container_address']['bridge'] is undefined
- is_metal | bool
tags:
- nova-config
- name: Set nova management address (container)
set_fact:
management_address: "{{ hostvars[inventory_hostname]['container_networks']['container_address']['address'] }}"
when:
- hostvars[inventory_hostname]['container_networks']['container_address']['address'] is defined
- not is_metal | bool
tags:
- nova-config
- name: Set nova management address (container no container network)
set_fact:
management_address: "{{ ansible_ssh_host }}"
when:
- hostvars[inventory_hostname]['container_networks']['container_address']['address'] is undefined
- not is_metal | bool
tags:
- nova-config
roles:
- role: "os_nova"
nova_novncproxy_git_repo: "{{ openstack_repo_git_url }}/novnc"
@ -119,6 +158,7 @@
nova_spicehtml5_git_repo: "{{ openstack_repo_git_url }}/spice-html5"
nova_spicehtml5_git_install_branch: "{{ spicehtml5_git_install_branch }}"
nova_galera_address: "{{ internal_lb_vip_address }}"
nova_management_address: "{{ management_address }}"
tags:
- "os-nova"
- role: "ceph_client"

8
playbooks/roles/os_nova/templates/nova.conf.j2
View File

@ -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]