Merge "Make nova_ssh listen on api_interface as well" into stable/wallaby

Author: Zuul

ansible/roles/nova-cell/tasks/precheck.yml

@@ -68,7 +68,21 @@
     - nova_spicehtml5proxy.enabled | bool
     - inventory_hostname in groups[nova_spicehtml5proxy.group]
 
-- name: Checking free port for Nova SSH
+- name: Checking free port for Nova SSH (API interface)
+  vars:
+    nova_ssh: "{{ nova_cell_services['nova-ssh'] }}"
+  wait_for:
+    host: "{{ api_interface_address }}"
+    port: "{{ nova_ssh_port }}"
+    connect_timeout: 1
+    timeout: 1
+    state: stopped
+  when:
+    - container_facts['nova_ssh'] is not defined
+    - nova_ssh.enabled | bool
+    - inventory_hostname in groups[nova_ssh.group]
+
+- name: Checking free port for Nova SSH (migration interface)
   vars:
     nova_ssh: "{{ nova_cell_services['nova-ssh'] }}"
   wait_for:
@@ -78,6 +92,7 @@
     timeout: 1
     state: stopped
   when:
+    - migration_interface_address != api_interface_address
     - container_facts['nova_ssh'] is not defined
     - nova_ssh.enabled | bool
     - inventory_hostname in groups[nova_ssh.group]

ansible/roles/nova-cell/templates/sshd_config.j2

@@ -1,5 +1,8 @@
 Port {{ nova_ssh_port }}
+ListenAddress {{ api_interface_address }}
+{% if migration_interface_address != api_interface_address %}
 ListenAddress {{ migration_interface_address }}
+{% endif %}
 
 SyslogFacility AUTHPRIV
 UsePAM yes

releasenotes/notes/bug-1956976-8a2623ca1fbfd546.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes Nova resize failing when ``migration_interface`` is customised.
+    `LP#1956976 <https://launchpad.net/bugs/1956976>`__