openstack/kolla-ansible
Code Issues Proposed changes

Merge "nova: add support for a dedicated migration network"

Browse Source
This commit is contained in:
Zuul 2018-10-24 13:14:53 +00:00 committed by Gerrit Code Review
commit 4df396ac2a
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -163,10 +163,12 @@ kolla_external_vip_interface: "{{ network_interface }}"
api_interface: "{{ network_interface }}" api_interface: "{{ network_interface }}"
storage_interface: "{{ network_interface }}" storage_interface: "{{ network_interface }}"
cluster_interface: "{{ network_interface }}" cluster_interface: "{{ network_interface }}"
migration_interface: "{{ network_interface }}"
tunnel_interface: "{{ network_interface }}" tunnel_interface: "{{ network_interface }}"
octavia_network_interface: "{{ api_interface }}" octavia_network_interface: "{{ api_interface }}"
bifrost_network_interface: "{{ network_interface }}" bifrost_network_interface: "{{ network_interface }}"
dns_interface: "{{ network_interface }}" dns_interface: "{{ network_interface }}"
migration_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + migration_interface]['ipv4']['address'] }}"
tunnel_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + tunnel_interface]['ipv4']['address'] }}" tunnel_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + tunnel_interface]['ipv4']['address'] }}"
octavia_network_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + octavia_network_interface]['ipv4']['address'] }}" octavia_network_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + octavia_network_interface]['ipv4']['address'] }}"

2
ansible/roles/nova/tasks/precheck.yml
View File

@ -95,7 +95,7 @@
vars: vars:
nova_ssh: "{{ nova_services['nova-ssh'] }}" nova_ssh: "{{ nova_services['nova-ssh'] }}"
wait_for: wait_for:
host: "{{ api_interface_address }}" host: "{{ migration_interface_address }}"
port: "{{ nova_ssh_port }}" port: "{{ nova_ssh_port }}"
connect_timeout: 1 connect_timeout: 1
timeout: 1 timeout: 1

2
ansible/roles/nova/templates/libvirtd.conf.j2
View File

@ -4,5 +4,5 @@ auth_tcp = "none"
ca_file = "" ca_file = ""
log_level = 3 log_level = 3
log_outputs = "3:file:/var/log/kolla/libvirt/libvirtd.log" log_outputs = "3:file:/var/log/kolla/libvirt/libvirtd.log"
listen_addr = "{{ api_interface_address }}" listen_addr = "{{ migration_interface_address }}"
tcp_port = "{{ nova_libvirt_port }}" tcp_port = "{{ nova_libvirt_port }}"

2
ansible/roles/nova/templates/nova.conf.j2
View File

@ -185,7 +185,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
{% if nova_compute_virt_type in ['kvm', 'qemu'] %} {% if nova_compute_virt_type in ['kvm', 'qemu'] %}
[libvirt] [libvirt]
connection_uri = "qemu+tcp://{{ api_interface_address }}/system" connection_uri = "qemu+tcp://{{ migration_interface_address }}/system"
{% if enable_ceph | bool and nova_backend == "rbd" %} {% if enable_ceph | bool and nova_backend == "rbd" %}
images_type = rbd images_type = rbd
images_rbd_pool = {{ ceph_nova_pool_name }} images_rbd_pool = {{ ceph_nova_pool_name }}

2
ansible/roles/nova/templates/sshd_config.j2
View File

@ -1,5 +1,5 @@
Port {{ nova_ssh_port }} Port {{ nova_ssh_port }}
ListenAddress {{ api_interface_address }} ListenAddress {{ migration_interface_address }}
SyslogFacility AUTHPRIV SyslogFacility AUTHPRIV
UsePAM yes UsePAM yes

5
releasenotes/notes/add-migration-interface-b53da3ff04c2a7fe.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Two new parameters (migration_interface, migration_interface_address) to make
the use of a dedicated migration network possible.