zuul_stream : Use !127.0.0.1 for loopback

This is a follow-on to Ia78ad9e3ec51bc47bf68c9ff38c0fcd16ba2e728 to
use a different loopback address for the local connection to the
Python 2.7 container.  This way, we don't have to override the
existing localhost/127.0.0.1 matches that avoid the executor trying to
talk to a zuul_console daemon.  These bits are removed.

The comment around the port settings is updated while we're here.

Change-Id: I33b2198baba13ea348052e998b1a5a362c165479
This commit is contained in:
Ian Wienand
2022-09-07 08:44:40 +10:00
parent 34543b8ac5
commit 78050adb51
4 changed files with 9 additions and 10 deletions

View File

@@ -18,4 +18,4 @@
- name: Accept host keys
shell: |
ssh-keyscan -p 2022 localhost >> ~/.ssh/known_hosts
ssh-keyscan -p 2022 127.0.0.1 >> ~/.ssh/known_hosts
ssh-keyscan -p 2022 127.0.0.2 >> ~/.ssh/known_hosts

View File

@@ -23,7 +23,7 @@
hosts:
node3:
ansible_connection: ssh
ansible_host: 127.0.0.1
ansible_host: 127.0.0.2
ansible_port: 2022
ansible_user: root
ansible_python_interpreter: /usr/local/bin/python2.7

View File

@@ -19,7 +19,6 @@
ZUUL_JOB_LOG_CONFIG: "{{ ansible_user_dir}}/logging.json"
ZUUL_JOBDIR: "{{ ansible_user_dir}}"
PYTHONPATH: "{{ python_path }}"
ZUUL_CONSOLE_STREAM_LOCALHOST: 1
register: _success_output
- name: Save raw output to file