Skip to content

Commit 170bca9

Browse files
committed
Make nova_ssh listen on api_interface as well
This is required as nova_compute tries to reach my_ip of the other node when resizing an instance and my_ip is set to api_interface_address. This potential issue was introduced with [1]. [1] https://review.opendev.org/c/openstack/kolla-ansible/+/569131 Closes-Bug: #1956976 Change-Id: Id57a672c69a2d5aa74e55f252d05bb756bbc945a (cherry picked from commit 75b69ea)
1 parent c6b840f commit 170bca9

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,21 @@
6868
- nova_spicehtml5proxy.enabled | bool
6969
- inventory_hostname in groups[nova_spicehtml5proxy.group]
7070

71-
- name: Checking free port for Nova SSH
71+
- name: Checking free port for Nova SSH (API interface)
72+
vars:
73+
nova_ssh: "{{ nova_cell_services['nova-ssh'] }}"
74+
wait_for:
75+
host: "{{ api_interface_address }}"
76+
port: "{{ nova_ssh_port }}"
77+
connect_timeout: 1
78+
timeout: 1
79+
state: stopped
80+
when:
81+
- container_facts['nova_ssh'] is not defined
82+
- nova_ssh.enabled | bool
83+
- inventory_hostname in groups[nova_ssh.group]
84+
85+
- name: Checking free port for Nova SSH (migration interface)
7286
vars:
7387
nova_ssh: "{{ nova_cell_services['nova-ssh'] }}"
7488
wait_for:
@@ -78,6 +92,7 @@
7892
timeout: 1
7993
state: stopped
8094
when:
95+
- migration_interface_address != api_interface_address
8196
- container_facts['nova_ssh'] is not defined
8297
- nova_ssh.enabled | bool
8398
- inventory_hostname in groups[nova_ssh.group]
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Port {{ nova_ssh_port }}
2+
ListenAddress {{ api_interface_address }}
3+
{% if migration_interface_address != api_interface_address %}
24
ListenAddress {{ migration_interface_address }}
5+
{% endif %}
36

47
SyslogFacility AUTHPRIV
58
UsePAM yes
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes Nova resize failing when ``migration_interface`` is customised.
5+
`LP#1956976 <https://launchpad.net/bugs/1956976>`__

0 commit comments

Comments
 (0)