Merge "Move gerritbot/accessbot to new eavesdrop server"

changes/07/795207/1
Zuul 2 years ago committed by Gerrit Code Review
commit 1077849a52
  1. 7
      inventory/service/groups.yaml
  2. 23
      playbooks/service-eavesdrop.yaml
  3. 2
      testinfra/test_eavesdrop.py
  4. 10
      zuul.d/system-config-run.yaml

@ -49,8 +49,7 @@ groups:
dns:
- adns*.opendev.org
- ns*.opendev.org
eavesdrop: eavesdrop[0-9]*.openstack.org
eavesdrop_opendev: eavesdrop[0-9]*.opendev.org
eavesdrop: eavesdrop[0-9]*.opendev.org
elasticsearch: elasticsearch[0-9]*.open*.org
ethercalc: ethercalc*.open*.org
etherpad: etherpad[0-9]*.open*.org
@ -134,7 +133,6 @@ groups:
puppet:
- ask*.open*.org
- cacti[0-9]*.open*.org
- eavesdrop[0-9]*.openstack.org
- elasticsearch[0-9]*.open*.org
- ethercalc[0-9]*.open*.org
- health[0-9]*.openstack.org
@ -155,7 +153,6 @@ groups:
puppet4:
- ask*.open*.org
- cacti[0-9]*.open*.org
- eavesdrop[0-9]*.openstack.org
- elasticsearch[0-9]*.open*.org
- ethercalc[0-9]*.open*.org
- health[0-9]*.openstack.org
@ -201,7 +198,7 @@ groups:
- ask*.open*.org
- cacti[0-9]*.open*.org
- codesearch[0-9]*.opendev.org
- eavesdrop[0-9]*.open*.org
- eavesdrop[0-9]*.opendev.org
- ethercalc[0-9]*.open*.org
- etherpad[0-9]*.open*.org
- grafana[0-9]*.opendev.org

@ -1,30 +1,9 @@
- hosts: 'localhost:!disabled'
name: Install puppet role/modules
strategy: linear
roles:
- puppet-setup-ansible
- hosts: 'eavesdrop_opendev:!disabled'
- hosts: 'eavesdrop:!disabled'
name: "eavesdrop: install services"
strategy: free
roles:
- iptables
- install-docker
- hosts: 'eavesdrop:!disabled'
name: "eavesdrop: run puppet on eavesdrop"
strategy: free
roles:
- iptables
- sync-project-config
- install-docker
- accessbot
- gerritbot
# NOTE(ianw) 2021-06-02
# We have disabled puppet because we are updating
# meetbot to python3, and we don't want to trigger
# pip trying to re-install it on the production server
# in case it tries to use python3 (even if we install from
# a tag, we're not sure puppet won't start using pip3 to install).
# - name: puppet-run
# manifest: /opt/system-config/production/manifests/eavesdrop.pp

@ -13,7 +13,7 @@
# under the License.
testinfra_hosts = ['eavesdrop01.openstack.org']
testinfra_hosts = ['eavesdrop01.opendev.org']
def test_eavesdrop(host):

@ -134,8 +134,8 @@
nodes:
- name: bridge.openstack.org
label: ubuntu-bionic
- name: eavesdrop01.openstack.org
label: ubuntu-xenial
- name: eavesdrop01.opendev.org
label: ubuntu-focal
vars:
run_playbooks:
- playbooks/service-eavesdrop.yaml
@ -143,16 +143,10 @@
- playbooks/service-eavesdrop.yaml
- playbooks/run-accessbot.yaml
- inventory/service/group_vars/eavesdrop.yaml
- inventory/service/group_vars/puppet.yaml
- playbooks/roles/zuul-user
- playbooks/roles/install-docker
- playbooks/roles/puppet-install/
- playbooks/roles/disable-puppet-agent/
- playbooks/roles/accessbot
- playbooks/roles/logrotate
- playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2
- modules/openstack_project/manifests/eavesdrop.pp
- manifests/eavesdrop.pp
- docker/accessbot/
- testinfra/test_eavesdrop.py

Loading…
Cancel
Save