diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 6f3a9628c7..557a44874c 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -163,10 +163,12 @@ kolla_external_vip_interface: "{{ network_interface }}" api_interface: "{{ network_interface }}" storage_interface: "{{ network_interface }}" cluster_interface: "{{ network_interface }}" +migration_interface: "{{ network_interface }}" tunnel_interface: "{{ network_interface }}" octavia_network_interface: "{{ api_interface }}" bifrost_network_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'] }}" octavia_network_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + octavia_network_interface]['ipv4']['address'] }}" diff --git a/ansible/roles/nova/tasks/precheck.yml b/ansible/roles/nova/tasks/precheck.yml index 8f0193d2fb..2cc6065679 100644 --- a/ansible/roles/nova/tasks/precheck.yml +++ b/ansible/roles/nova/tasks/precheck.yml @@ -95,7 +95,7 @@ vars: nova_ssh: "{{ nova_services['nova-ssh'] }}" wait_for: - host: "{{ api_interface_address }}" + host: "{{ migration_interface_address }}" port: "{{ nova_ssh_port }}" connect_timeout: 1 timeout: 1 diff --git a/ansible/roles/nova/templates/libvirtd.conf.j2 b/ansible/roles/nova/templates/libvirtd.conf.j2 index 237a2074ce..4e8863f90a 100644 --- a/ansible/roles/nova/templates/libvirtd.conf.j2 +++ b/ansible/roles/nova/templates/libvirtd.conf.j2 @@ -4,5 +4,5 @@ auth_tcp = "none" ca_file = "" log_level = 3 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 }}" diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 53d2354042..1a4fb39846 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -185,7 +185,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi {% if nova_compute_virt_type in ['kvm', 'qemu'] %} [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" %} images_type = rbd images_rbd_pool = {{ ceph_nova_pool_name }} diff --git a/ansible/roles/nova/templates/sshd_config.j2 b/ansible/roles/nova/templates/sshd_config.j2 index 29bea8dea1..5426d48a31 100644 --- a/ansible/roles/nova/templates/sshd_config.j2 +++ b/ansible/roles/nova/templates/sshd_config.j2 @@ -1,5 +1,5 @@ Port {{ nova_ssh_port }} -ListenAddress {{ api_interface_address }} +ListenAddress {{ migration_interface_address }} SyslogFacility AUTHPRIV UsePAM yes diff --git a/releasenotes/notes/add-migration-interface-b53da3ff04c2a7fe.yaml b/releasenotes/notes/add-migration-interface-b53da3ff04c2a7fe.yaml new file mode 100644 index 0000000000..c92c815273 --- /dev/null +++ b/releasenotes/notes/add-migration-interface-b53da3ff04c2a7fe.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Two new parameters (migration_interface, migration_interface_address) to make + the use of a dedicated migration network possible.