diff --git a/inventory/backups b/inventory/backups index 8bd8936aa8..0d7b49d470 100644 --- a/inventory/backups +++ b/inventory/backups @@ -15,6 +15,6 @@ pkgs01.iad2.fedoraproject.org log01.iad2.fedoraproject.org db-openqa01.iad2.fedoraproject.org db-koji01.iad2.fedoraproject.org -value01.iad2.fedoraproject.org +value02.iad2.fedoraproject.org tang01.iad2.fedoraproject.org ipa01.iad2.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index 587c0d19b0..804a8530ab 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -703,7 +703,6 @@ rabbitmq03.stg.iad2.fedoraproject.org sign-bridge01.stg.iad2.fedoraproject.org sign-vault01.stg.iad2.fedoraproject.org sundries01.stg.iad2.fedoraproject.org -value01.stg.iad2.fedoraproject.org value02.stg.iad2.fedoraproject.org vmhost-x86-02.stg.iad2.fedoraproject.org vmhost-x86-03.stg.iad2.fedoraproject.org @@ -754,11 +753,9 @@ sundries02.iad2.fedoraproject.org sundries01.stg.iad2.fedoraproject.org [value] -value01.iad2.fedoraproject.org value02.iad2.fedoraproject.org [value_stg] -value01.stg.iad2.fedoraproject.org value02.stg.iad2.fedoraproject.org [virthost] @@ -1164,7 +1161,6 @@ pagure02.fedoraproject.org pkgs01.iad2.fedoraproject.org notifs-web01.iad2.fedoraproject.org #wiki01.iad2.fedoraproject.org -value01.iad2.fedoraproject.org [nfs_servers] storinator01.rdu-cc.fedoraproject.org diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index e86f3c1d0f..49cbde764b 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -33,17 +33,11 @@ when: inventory_hostname.startswith('value02.iad2')} - collectd/base - apache - - {role: fedmsg/base, - when: inventory_hostname.startswith('value01')} - - {role: fedmsg/irc, - when: inventory_hostname.startswith('value01')} - supybot - sudo - rsyncd - role: collectd/fedmsg-service process: fedmsg-irc - - {role: mote, - when: inventory_hostname.startswith('value01')} - {role: nfs/client, nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3", mnt_dir: '/srv/', diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index c3a36e8d78..2304f39802 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -103,7 +103,7 @@ destname: meetbot remotepath: /meetbot/ # Talk directly to the app server, not haproxy - proxyurl: http://value01 + proxyurl: http://value02 when: env != "staging" # The place for the fancy mote view diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2 index 6df1454a9e..41563914bf 100644 --- a/roles/fedmsg/base/templates/endpoints.py.j2 +++ b/roles/fedmsg/base/templates/endpoints.py.j2 @@ -25,8 +25,8 @@ config = dict( # to use. This can be overridden by explicitly providing the name in # the initial call to fedmsg.init(...). # This used to be on value01 and value03.. but now we just have one - "supybot.value01": [ - "tcp://value01.%s:3000" % suffix, + "supybot.value02": [ + "tcp://value02.%s:3000" % suffix, ], # koji is not listed here since it publishes to the fedmsg-relay diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg b/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg index b97dcfe0a9..a333ed31bc 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg @@ -3,13 +3,6 @@ # BEGIN, check for the existance of processes -define service { - host_name value01.iad2.fedoraproject.org - service_description Check for fedmsg-irc proc - check_command check_by_nrpe!check_fedmsg_irc_proc - use defaulttemplate -} - define service { hostgroup_name proxies service_description Check fedmsg-gateway consumers backlog @@ -235,13 +228,6 @@ define service { use defaulttemplate } -define service { - host_name value01.iad2.fedoraproject.org - service_description Check fedmsg consumers and producers irc - check_command check_by_nrpe!check_fedmsg_cp_value - use defaulttemplate -} - define service { host_name badges-backend01.iad2.fedoraproject.org service_description Check fedmsg consumers and producers hub @@ -294,13 +280,6 @@ define service { use defaulttemplate } -define service { - host_name value01.iad2.fedoraproject.org - service_description Check fedmsg-irc consumers exceptions - check_command check_by_nrpe!check_fedmsg_cexceptions_value - use defaulttemplate -} - define service { host_name badges-backend01.iad2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions @@ -361,13 +340,6 @@ define service { use defaulttemplate } -define service { - host_name value01.iad2.fedoraproject.org - service_description Check fedmsg-irc consumers backlog - check_command check_by_nrpe!check_fedmsg_cbacklog_value - use defaulttemplate -} - define service { host_name badges-backend01.iad2.fedoraproject.org service_description Check fedmsg-hub consumers backlog diff --git a/roles/supybot/tasks/main.yml b/roles/supybot/tasks/main.yml index 852ada346c..9d4ba16e7a 100644 --- a/roles/supybot/tasks/main.yml +++ b/roles/supybot/tasks/main.yml @@ -1,17 +1,3 @@ -- name: install limnoria package - package: name={{ item }} state=present enablerepo=epel-testing - with_items: - - limnoria - - supybot-fedora - - supybot-koji - - supybot-notify - - supybot-pinglists - - supybot-fedmsg - - packagedb-cli - - python-simplejson - when: inventory_hostname.startswith('value01') - tags: supybot - - name: install limnoria package package: name={{ item }} state=present enablerepo=epel-testing with_items: @@ -56,7 +42,7 @@ minute: "0" user: apache job: "/usr/local/bin/meetings_by_team.sh" - state: "{{ 'present' if inventory_hostname.startswith('value01') else 'absent' }}" + state: "{{ 'present' if inventory_hostname.startswith('value02') else 'absent' }}" tags: supybot - name: setup archive script @@ -70,9 +56,9 @@ minute: "30" user: apache job: "/usr/local/bin/archive.sh >& /dev/null" - state: "{{ 'present' if inventory_hostname.startswith('value01') else 'absent' }}" + state: "{{ 'present' if inventory_hostname.startswith('value02') else 'absent' }}" tags: supybot - when: inventory_hostname.startswith('value01') + when: inventory_hostname.startswith('value02') - name: setup meetbot.conf apache config copy: src=meetbot.conf dest=/etc/httpd/conf.d/meetbot.conf mode=644 diff --git a/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 b/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 index 297fd826a2..9823f39eb9 100644 --- a/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 +++ b/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 @@ -38,7 +38,7 @@ synced_hosts: # - blockerbugs01.iad2.fedoraproject.org # - blockerbugs02.iad2.fedoraproject.org # - blockerbugs01.stg.iad2.fedoraproject.org - - value01.iad2.fedoraproject.org + - value02.iad2.fedoraproject.org - people02.vpn.fedoraproject.org - noc01.iad2.fedoraproject.org - dl01.iad2.fedoraproject.org