the butler did it in the basement with a 2x4

inventory/cloud

@@ -51,12 +51,6 @@ glittergallery-dev.fedorainfracloud.org
 hubs-dev.fedorainfracloud.org
 iddev.fedorainfracloud.org
 java-deptools.fedorainfracloud.org
-jenkins.fedorainfracloud.org
-jenkins-slave-el6.fedorainfracloud.org
-jenkins-slave-el7.fedorainfracloud.org
-jenkins-slave-f26.fedorainfracloud.org
-jenkins-slave-f25.fedorainfracloud.org
-jenkins-slave-f27-ppc64le.fedorainfracloud.org
 simple-koji-ci-dev.fedorainfracloud.org
 simple-koji-ci-prod.fedorainfracloud.org
 lists-dev.fedorainfracloud.org

inventory/group_vars/jenkins-master

@@ -1,49 +0,0 @@
----
-datacenter: cloud
-freezes: false
-ansible_ifcfg_blacklist: true
-
-slaves:
-- name: EL6
-  host: jenkins-slave-el6.fedorainfracloud.org
-  description: CentOS 6.8
-  labels: el EL el6 EL6 centos CentOS centos6 CentOS6
-  capacity: 4
-- name: EL7
-  host: jenkins-slave-el7.fedorainfracloud.org
-  description: Red Hat Enterprise Linux Server 7.3
-  labels: el EL el7 EL7 rhel RHEL rhel7 RHEL7
-  capacity: 4
-- name: F26
-  host: jenkins-slave-f26.fedorainfracloud.org
-  description: Fedora 26
-  labels: fedora Fedora fedora26 Fedora26
-  capacity: 4
-- name: F25
-  host: jenkins-slave-f25.fedorainfracloud.org
-  description: Fedora 25
-  labels: fedora Fedora fedora25 Fedora25
-  capacity: 4
-- name: F27-ppc64le
-  host: jenkins-slave-f27-ppc64le.fedorainfracloud.org
-  description: Fedora 27 ppc64le
-  labels: fedora Fedora fedora25 Fedora25 Fedora25ppc64le ppc64le Fedora27 Fedora27ppc64le
-  capacity: 4
-
-# These are consumed by a task in roles/fedmsg/base/main.yml
-fedmsg_certs:
-- service: shell
-  owner: root
-  group: root
-  can_send:
-  - logger.log
-- service: jenkins
-  owner: root
-  group: jenkins
-  can_send:
-  - jenkins.build.aborted
-  - jenkins.build.failed
-  - jenkins.build.notbuilt
-  - jenkins.build.passed
-  - jenkins.build.start
-  - jenkins.build.unstable

inventory/host_vars/jenkins-slave-el6.fedorainfracloud.org

@@ -1,18 +0,0 @@
----
-image: "{{ centos66_x86_64 }}"
-instance_type: m1.xlarge
-keypair: fedora-admin-20130801
-security_group: ssh-anywhere-persistent,all-icmp-persistent,default
-zone: nova
-tcp_ports: [22]
-
-inventory_tenant: persistent
-inventory_instance_name: jenkins-el6
-hostbase: jenkins-el6
-public_ip: 209.132.184.58
-description: jenkins el6 builder in new cloud
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
-

inventory/host_vars/jenkins-slave-el7.fedorainfracloud.org

@@ -1,18 +0,0 @@
----
-image: rhel7-20141015
-instance_type: m1.xlarge
-keypair: fedora-admin-20130801
-security_group: ssh-anywhere-persistent,all-icmp-persistent,default
-zone: nova
-tcp_ports: [22]
-
-inventory_tenant: persistent
-inventory_instance_name: jenkins-el7
-hostbase: jenkins-el7
-public_ip: 209.132.184.189
-description: jenkins el7 builder in new cloud
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
-

inventory/host_vars/jenkins-slave-f25.fedorainfracloud.org

@@ -1,18 +0,0 @@
----
-image: "{{ fedora25_x86_64 }}"
-instance_type: m1.xlarge
-keypair: fedora-admin-20130801
-security_group: ssh-anywhere-persistent,all-icmp-persistent,default
-zone: nova
-tcp_ports: [22]
-
-inventory_tenant: persistent
-inventory_instance_name: jenkins-slave-f25
-hostbase: jenkins-slave-f25
-public_ip: 209.132.184.248
-description: jenkins f25 builder in new cloud
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
-

inventory/host_vars/jenkins-slave-f26.fedorainfracloud.org

@@ -1,18 +0,0 @@
----
-image: "{{ fedora26_x86_64 }}"
-instance_type: m1.xlarge
-keypair: fedora-admin-20130801
-security_group: ssh-anywhere-persistent,all-icmp-persistent,default
-zone: nova
-tcp_ports: [22]
-
-inventory_tenant: persistent
-inventory_instance_name: jenkins-slave-f26
-hostbase: jenkins-slave-f26
-public_ip: 209.132.184.237
-description: jenkins f26 builder in new cloud
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
-

inventory/host_vars/jenkins-slave-f27-ppc64le.fedorainfracloud.org

@@ -1,18 +0,0 @@
----
-image: Fedora-Cloud-Base-27-1.6.ppc64le
-instance_type: m1.large
-keypair: fedora-admin-20130801
-security_group: ssh-anywhere-persistent,all-icmp-persistent,default
-zone: nova
-tcp_ports: [22]
-
-inventory_tenant: persistent
-inventory_instance_name: jenkins-slave-f27-ppc64le
-hostbase: jenkins-slave-f27-ppc64le
-public_ip: 209.132.184.56
-description: jenkins f27 builder in new cloud, ppc64le version
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
-

inventory/host_vars/jenkins.fedorainfracloud.org

@@ -1,28 +0,0 @@
----
-image: "{{ fedora26_x86_64 }}"
-instance_type: m1.medium
-keypair: fedora-admin-20130801
-security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default,web-443-anywhere-persistent,all-icmp-persistent
-zone: nova
-tcp_ports: [22, 80, 443, 8080]
-
-inventory_tenant: persistent
-inventory_instance_name: jenkins
-hostbase: jenkins
-public_ip: 209.132.184.57
-description: jenkins master in new cloud
-
-volumes:
-  - volume_id: 7d09e0a3-1f2b-4c9d-ad64-372315199f07
-    device: /dev/vdb
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
-
-#
-# These are letsencrypt certs. 
-# They are linked from these normal places to the place they are renewed
-#
-cert_name: jenkins.fedorainfracloud.org
-sSLCertificateChainFile: jenkins.fedorainfracloud.org.chain

inventory/inventory

@@ -1203,16 +1203,6 @@ ppc64le-test.fedorainfracloud.org
 el6-test.fedorainfracloud.org
 el7-test.fedorainfracloud.org
 
-[jenkins-master]
-jenkins.fedorainfracloud.org
-
-[jenkins-slave]
-jenkins-slave-el6.fedorainfracloud.org
-jenkins-slave-el7.fedorainfracloud.org
-jenkins-slave-f25.fedorainfracloud.org
-jenkins-slave-f26.fedorainfracloud.org
-jenkins-slave-f27-ppc64le.fedorainfracloud.org
-
 [osuosl]
 proxy06.fedoraproject.org
 

playbooks/groups/jenkins-master.yml

@@ -1,49 +0,0 @@
-- name: check/create instance
-  hosts: jenkins-master
-  gather_facts: False
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/web/infra/ansible/vars/fedora-cloud.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
-
-- name: setup all the things
-  hosts: jenkins-master
-  gather_facts: True
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  pre_tasks:
-  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
-  - name: set hostname (required by some services, at least postfix need it)
-    hostname: name="{{inventory_hostname}}"
-  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-
-- name: provision instance
-  hosts: jenkins-master
-  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
-  - jenkins/master
-  - fedmsg/base
-  - apache
-  - certbot
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - import_tasks: "{{ tasks_path }}/motd.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"

playbooks/groups/jenkins-slave.yml

@@ -1,47 +0,0 @@
-- name: check/create instance
-  hosts: jenkins-slave
-  gather_facts: False
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/web/infra/ansible/vars/fedora-cloud.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
-
-- name: setup all the things
-  hosts: jenkins-slave
-  gather_facts: True
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  pre_tasks:
-  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
-  - name: set hostname (required by some services, at least postfix need it)
-    hostname: name="{{inventory_hostname}}"
-  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-
-- name: provision instance
-  hosts: jenkins-slave
-  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
-  - jenkins/slave
-
-  tasks:
-# - import_tasks: "{{ tasks_path }}/growroot_cloud.yml"
-  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - import_tasks: "{{ tasks_path }}/motd.yml"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"