Move gerritbot/accessbot to new eavesdrop server
This moves these services to eavesdrop01.opendev.org, a new Focal-based server to host IRC services. We have stopped running puppet on eavesdrop01.openstack.org so there is nothing left for it to do (note the server is still running meetbot/ptgbot). Remove the commented out puppet run, and remove the server from puppet groups. Update the host in the Zuul jobs to the new node. Change-Id: I809f9af3e78f566362142790f6c79654ef5b8959
This commit is contained in:
parent
fb94b79e82
commit
fec8018581
@ -49,8 +49,7 @@ groups:
|
|||||||
dns:
|
dns:
|
||||||
- adns*.opendev.org
|
- adns*.opendev.org
|
||||||
- ns*.opendev.org
|
- ns*.opendev.org
|
||||||
eavesdrop: eavesdrop[0-9]*.openstack.org
|
eavesdrop: eavesdrop[0-9]*.opendev.org
|
||||||
eavesdrop_opendev: eavesdrop[0-9]*.opendev.org
|
|
||||||
elasticsearch: elasticsearch[0-9]*.open*.org
|
elasticsearch: elasticsearch[0-9]*.open*.org
|
||||||
ethercalc: ethercalc*.open*.org
|
ethercalc: ethercalc*.open*.org
|
||||||
etherpad: etherpad[0-9]*.open*.org
|
etherpad: etherpad[0-9]*.open*.org
|
||||||
@ -134,7 +133,6 @@ groups:
|
|||||||
puppet:
|
puppet:
|
||||||
- ask*.open*.org
|
- ask*.open*.org
|
||||||
- cacti[0-9]*.open*.org
|
- cacti[0-9]*.open*.org
|
||||||
- eavesdrop[0-9]*.openstack.org
|
|
||||||
- elasticsearch[0-9]*.open*.org
|
- elasticsearch[0-9]*.open*.org
|
||||||
- ethercalc[0-9]*.open*.org
|
- ethercalc[0-9]*.open*.org
|
||||||
- health[0-9]*.openstack.org
|
- health[0-9]*.openstack.org
|
||||||
@ -155,7 +153,6 @@ groups:
|
|||||||
puppet4:
|
puppet4:
|
||||||
- ask*.open*.org
|
- ask*.open*.org
|
||||||
- cacti[0-9]*.open*.org
|
- cacti[0-9]*.open*.org
|
||||||
- eavesdrop[0-9]*.openstack.org
|
|
||||||
- elasticsearch[0-9]*.open*.org
|
- elasticsearch[0-9]*.open*.org
|
||||||
- ethercalc[0-9]*.open*.org
|
- ethercalc[0-9]*.open*.org
|
||||||
- health[0-9]*.openstack.org
|
- health[0-9]*.openstack.org
|
||||||
@ -201,7 +198,7 @@ groups:
|
|||||||
- ask*.open*.org
|
- ask*.open*.org
|
||||||
- cacti[0-9]*.open*.org
|
- cacti[0-9]*.open*.org
|
||||||
- codesearch[0-9]*.opendev.org
|
- codesearch[0-9]*.opendev.org
|
||||||
- eavesdrop[0-9]*.open*.org
|
- eavesdrop[0-9]*.opendev.org
|
||||||
- ethercalc[0-9]*.open*.org
|
- ethercalc[0-9]*.open*.org
|
||||||
- etherpad[0-9]*.open*.org
|
- etherpad[0-9]*.open*.org
|
||||||
- grafana[0-9]*.opendev.org
|
- grafana[0-9]*.opendev.org
|
||||||
|
@ -1,30 +1,9 @@
|
|||||||
- hosts: 'localhost:!disabled'
|
- hosts: 'eavesdrop:!disabled'
|
||||||
name: Install puppet role/modules
|
|
||||||
strategy: linear
|
|
||||||
roles:
|
|
||||||
- puppet-setup-ansible
|
|
||||||
|
|
||||||
- hosts: 'eavesdrop_opendev:!disabled'
|
|
||||||
name: "eavesdrop: install services"
|
name: "eavesdrop: install services"
|
||||||
strategy: free
|
strategy: free
|
||||||
roles:
|
roles:
|
||||||
- iptables
|
- iptables
|
||||||
- install-docker
|
- install-docker
|
||||||
|
|
||||||
- hosts: 'eavesdrop:!disabled'
|
|
||||||
name: "eavesdrop: run puppet on eavesdrop"
|
|
||||||
strategy: free
|
|
||||||
roles:
|
|
||||||
- iptables
|
|
||||||
- sync-project-config
|
- sync-project-config
|
||||||
- install-docker
|
|
||||||
- accessbot
|
- accessbot
|
||||||
- gerritbot
|
- 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.
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
testinfra_hosts = ['eavesdrop01.openstack.org']
|
testinfra_hosts = ['eavesdrop01.opendev.org']
|
||||||
|
|
||||||
|
|
||||||
def test_eavesdrop(host):
|
def test_eavesdrop(host):
|
||||||
|
@ -134,8 +134,8 @@
|
|||||||
nodes:
|
nodes:
|
||||||
- name: bridge.openstack.org
|
- name: bridge.openstack.org
|
||||||
label: ubuntu-bionic
|
label: ubuntu-bionic
|
||||||
- name: eavesdrop01.openstack.org
|
- name: eavesdrop01.opendev.org
|
||||||
label: ubuntu-xenial
|
label: ubuntu-focal
|
||||||
vars:
|
vars:
|
||||||
run_playbooks:
|
run_playbooks:
|
||||||
- playbooks/service-eavesdrop.yaml
|
- playbooks/service-eavesdrop.yaml
|
||||||
@ -143,16 +143,10 @@
|
|||||||
- playbooks/service-eavesdrop.yaml
|
- playbooks/service-eavesdrop.yaml
|
||||||
- playbooks/run-accessbot.yaml
|
- playbooks/run-accessbot.yaml
|
||||||
- inventory/service/group_vars/eavesdrop.yaml
|
- inventory/service/group_vars/eavesdrop.yaml
|
||||||
- inventory/service/group_vars/puppet.yaml
|
|
||||||
- playbooks/roles/zuul-user
|
|
||||||
- playbooks/roles/install-docker
|
- playbooks/roles/install-docker
|
||||||
- playbooks/roles/puppet-install/
|
|
||||||
- playbooks/roles/disable-puppet-agent/
|
|
||||||
- playbooks/roles/accessbot
|
- playbooks/roles/accessbot
|
||||||
- playbooks/roles/logrotate
|
- playbooks/roles/logrotate
|
||||||
- playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2
|
- playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2
|
||||||
- modules/openstack_project/manifests/eavesdrop.pp
|
|
||||||
- manifests/eavesdrop.pp
|
|
||||||
- docker/accessbot/
|
- docker/accessbot/
|
||||||
- testinfra/test_eavesdrop.py
|
- testinfra/test_eavesdrop.py
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user