Nuke transitional datanommer and new db-datanommer01

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

inventory/group_vars/transitional-datanommer

@@ -1,12 +0,0 @@
----
-# Define resources for this group of hosts here. 
-lvm_size: 20000
-mem_size: 8192
-num_cpus: 2
-
-# for systems that do not match the above - specify the same parameter in
-# the host_vars/$hostname file
-
-tcp_ports: []
-fas_client_groups: sysadmin-noc,sysadmin-datanommer,sysadmin-veteran
-fedmsg_certs: []

inventory/host_vars/db-datanommer01.phx2.fedoraproject.org

@@ -1,33 +0,0 @@
----
-nm: 255.255.255.0
-gw: 10.5.126.254
-dns: 10.5.126.21
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/
-volgroup: /dev/vg_guests
-eth0_ip: 10.5.126.20
-vmhost: virthost19.phx2.fedoraproject.org
-datacenter: phx2
-
-# This is a generic list, monitored by collectd
-databases:
-- datanommer
-
-# This is a more strict list, to be made publicly available
-#dbs_to_backup:
-#- datanommer
-
-# These are normally group variables, but in this case db servers are often different
-lvm_size: 1000000
-mem_size: 16384
-max_mem_size: "{{ mem_size * 2 }}"
-num_cpus: 8
-tcp_ports: [ 5432, 443 ]
-fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran
-
-# kernel SHMMAX value
-kernel_shmmax: 68719476736
-
-#host_backup_targets: ['/backups']
-shared_buffers: "4GB"
-effective_cache_size: "12GB"

inventory/host_vars/transitional-datanommer01.phx2.fedoraproject.org

@@ -1,14 +0,0 @@
----
-nm: 255.255.255.0
-gw: 10.5.126.254
-dns: 10.5.126.21
-
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
-
-eth0_ip: 10.5.126.24
-
-volgroup: /dev/vg_guests
-vmhost: virthost19.phx2.fedoraproject.org
-
-datacenter: phx2

inventory/inventory

@@ -175,9 +175,6 @@ fedimg01.phx2.fedoraproject.org
 [fedimg-stg]
 fedimg01.stg.phx2.fedoraproject.org
 
-[transitional-datanommer]
-transitional-datanommer01.phx2.fedoraproject.org
-
 [busgateway]
 busgateway01.phx2.fedoraproject.org
 
@@ -311,7 +308,6 @@ darkserver-backend01.stg.phx2.fedoraproject.org
 db01.phx2.fedoraproject.org
 db03.phx2.fedoraproject.org
 db-fas01.phx2.fedoraproject.org
-db-datanommer01.phx2.fedoraproject.org
 db-datanommer02.phx2.fedoraproject.org
 db-koji01.phx2.fedoraproject.org
 db-s390-koji01.s390.fedoraproject.org

playbooks/groups/transitional-datanommer.yml

@@ -1,50 +0,0 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=transitional-datanommer"
-
-- name: dole out the generic configuration
-  hosts: transitional-datanommer
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  roles:
-  - base
-  - rkhunter
-  - nagios_client
-  - hosts
-  - fas_client
-  - collectd/base
-  - fedmsg/base
-  - sudo
-  - openvpn/client
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-  - import_tasks: "{{ tasks_path }}/motd.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"
-
-- name: dole out the service-specific config
-  hosts: transitional-datanommer
-  user: root
-  gather_facts: True
-
-  roles:
-  - role: fedmsg/hub
-  - role: fedmsg/datanommer
-  - role: collectd/fedmsg-service
-    process: fedmsg-hub
-  - role: collectd/fedmsg-activation
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - "{{ vars_path }}/{{ ansible_distribution }}.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"

roles/fedmsg/datanommer/templates/datanommer.py

@@ -1,9 +1,7 @@
 # Configuration for the datanommer consumer.  A plugin for the fedmsg-hub process.
 config = {
     'datanommer.enabled': True,
-{% if 'transitional' in inventory_hostname %}
+{% if env == "production" %}
-    'datanommer.sqlalchemy.url': 'postgresql://{{ transitionalDatanommerDBUser }}:{{ transitionalDatanommerDBPassword }}@db-datanommer01/datanommer',
-{% elif env == "production" %}
     'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer02/datanommer',
 {% else %}
     'datanommer.sqlalchemy.url': 'postgresql://{{ datanommerDBUser }}:{{ datanommerDBPassword }}@db-datanommer.stg.phx2.fedoraproject.org/datanommer',

roles/openvpn/server/files/ccd/transitional-datanommer01.phx2.fedoraproject.org

@@ -1 +0,0 @@
-ifconfig-push 192.168.1.178 192.168.0.178