From ad16067ae8eedb5bae73296b7a3cd0a82006b00c Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 6 Oct 2021 19:06:39 +0000 Subject: [PATCH] Finish ptgbot configuration Set the channel we want ptgbot joining in production with a group var, like we do for statusbot's channel list. Correct the password var name to match what's used in the template for production (and matches the override set in our private hostvars on the bastion). Clean up the unnecessary auth nicks list which was copied from the statusbot config but is entirely unused. Also get rid of some unnecessary empty lines in the defaults as they really don't make the file any more readable. Change-Id: Id026b89d642eae13feba374e4f3ec610b543e530 --- inventory/service/group_vars/eavesdrop.yaml | 2 ++ playbooks/roles/ptgbot/defaults/main.yaml | 6 +----- playbooks/roles/ptgbot/templates/ptgbot.config.j2 | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/inventory/service/group_vars/eavesdrop.yaml b/inventory/service/group_vars/eavesdrop.yaml index e9b1805b97..53ba81ed45 100644 --- a/inventory/service/group_vars/eavesdrop.yaml +++ b/inventory/service/group_vars/eavesdrop.yaml @@ -95,6 +95,8 @@ limnoria_oftc_channels: - '#storyboard' - '#tacker' - '#tripleo' +ptgbot_channels: + - openinfra-events statusbot_channels: - airshipit - edge-computing-group diff --git a/playbooks/roles/ptgbot/defaults/main.yaml b/playbooks/roles/ptgbot/defaults/main.yaml index ea4623b805..8bcd58370b 100644 --- a/playbooks/roles/ptgbot/defaults/main.yaml +++ b/playbooks/roles/ptgbot/defaults/main.yaml @@ -1,10 +1,6 @@ ptgbot_nick: 'opendevptg_{{ 100 | random }}' -ptgbot_pass: '' +ptgbot_password: '' ptgbot_server: 'irc.oftc.net' - -ptgbot_auth_nicks: - - testonly ptgbot_channels: - opendev-sandbox - ptgbot_irclogs_url : 'https://meetings.opendev.org/' diff --git a/playbooks/roles/ptgbot/templates/ptgbot.config.j2 b/playbooks/roles/ptgbot/templates/ptgbot.config.j2 index 1f27c4d4c2..89dd0e0b7e 100644 --- a/playbooks/roles/ptgbot/templates/ptgbot.config.j2 +++ b/playbooks/roles/ptgbot/templates/ptgbot.config.j2 @@ -1,6 +1,6 @@ { "irc_nick": "{{ ptgbot_nick }}", - "irc_pass": "{{ ptgbot_pass }}", + "irc_pass": "{{ ptgbot_password }}", "irc_server": "{{ ptgbot_server }}", "irc_port": 6697, "irc_channel": "{{ ptgbot_channels | join(',') }}",