From f6be0f704008f992eb133c0330ef7a66dc26bcbc Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 28 Jan 2016 20:23:40 +0000 Subject: [PATCH] Nuke pdc.fedorainfracloud.org. --- inventory/host_vars/pdc.fedorainfracloud.org | 22 ------------ inventory/inventory | 5 --- master.yml | 1 - playbooks/hosts/pdc.fedorainfracloud.org.yml | 37 -------------------- roles/ipsilon/templates/saml2_data_stg | 5 --- 5 files changed, 70 deletions(-) delete mode 100644 inventory/host_vars/pdc.fedorainfracloud.org delete mode 100644 playbooks/hosts/pdc.fedorainfracloud.org.yml diff --git a/inventory/host_vars/pdc.fedorainfracloud.org b/inventory/host_vars/pdc.fedorainfracloud.org deleted file mode 100644 index ef8df5b771..0000000000 --- a/inventory/host_vars/pdc.fedorainfracloud.org +++ /dev/null @@ -1,22 +0,0 @@ ---- -image: rhel7-20141015 -instance_type: m1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,web-443-anywhere-persistent,default -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: persistent -inventory_instance_name: pdc -hostbase: pdc.fedorainfracloud.org -hostname: pdc.fedorainfracloud.org -pdc_domain: pdc.fedorainfracloud.org -public_ip: 209.132.184.106 -root_auth_users: pingou -description: pdc development instance - -shared_buffers: "32MB" - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" diff --git a/inventory/inventory b/inventory/inventory index 04a0fac92a..126600c51f 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -937,9 +937,6 @@ pdc-backend01.phx2.fedoraproject.org [pdc-backend-stg] pdc-backend01.stg.phx2.fedoraproject.org -[pdc-dev] -pdc.fedorainfracloud.org - [persistent-cloud] # artboard instance artboard.fedorainfracloud.org @@ -981,8 +978,6 @@ lists-dev.fedorainfracloud.org java-deptools.fedorainfracloud.org # developer ticket 4876 developer.fedorainfracloud.org -# PDC -pdc.fedorainfracloud.org # insim insim.fedorainfracloud.org # osbs devel machine diff --git a/master.yml b/master.yml index 0a61229f9b..62ea128ed6 100644 --- a/master.yml +++ b/master.yml @@ -142,7 +142,6 @@ - include: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/magazine.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml -- include: /srv/web/infra/ansible/playbooks/hosts/pdc.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/shumgrepper-dev.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/taiga.fedorainfracloud.org.yml diff --git a/playbooks/hosts/pdc.fedorainfracloud.org.yml b/playbooks/hosts/pdc.fedorainfracloud.org.yml deleted file mode 100644 index 3c26ebceee..0000000000 --- a/playbooks/hosts/pdc.fedorainfracloud.org.yml +++ /dev/null @@ -1,37 +0,0 @@ -- name: check/create instance - hosts: pdc.fedorainfracloud.org - 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: - - include: "{{ tasks }}/persistent_cloud.yml" - -- name: Set up basics for our pdc node. - hosts: pdc.fedorainfracloud.org - 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: - - include: "{{ tasks }}/cloud_setup_basic.yml" - - name: set hostname (required by some services, at least postfix need it) - shell: "hostname {{inventory_hostname}}" - - tasks: - - include: "{{ tasks }}/mod_wsgi.yml" - - roles: - - base - - postgresql_server - - pdc/frontend - - handlers: - - include: "{{ handlers }}/restart_services.yml" diff --git a/roles/ipsilon/templates/saml2_data_stg b/roles/ipsilon/templates/saml2_data_stg index 8b983b00fb..b454ea5022 100644 --- a/roles/ipsilon/templates/saml2_data_stg +++ b/roles/ipsilon/templates/saml2_data_stg @@ -1,8 +1,3 @@ -pdcdev id = https://pdc.fedorainfracloud.org/saml2 -pdcdev type = SP -pdcdev name = PDC Development -pdcdev metadata=MIIDGTCCAgGgAwIBAgIJAISFaB3/KZDhMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNVBAMMGHBkYy5mZWRvcmFpbmZyYWNsb3VkLm9yZzAeFw0xNTA5MzAxMDM4NTFaFw0yMDA5MjgxMDM4NTFaMCMxITAfBgNVBAMMGHBkYy5mZWRvcmFpbmZyYWNsb3VkLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLA2h4tYn7tAFwFZ2JBxLLcpIY55/NpdQP1yLSfvD4huT3rWRLoojiEpIM61qgnJmVsZ4oPkkSmU3pWLrjwZeD5XQimtg6GPHitjIIHhUgPDncpdGsbD1J/Jv7V/gj0CvI9ak0i9d0zxaKGaejP0VL78xeaEPf53LQywqrV9iGDRpcJzQZrqwUvrSIDRn7SmUNvDYQL6voAO6la/43CO8oIMiGE/qNs8sK/KupifxjN4BvZzK6ofpYqhycwJFHUTZ5mAEXspINIOr8I43ApF6+RDWyIt2G2GK7gwkLfNfb/3Lht8/oMjyiPvKuhSqaDbfcSwsU2A9k9vqV0ufL++VUCAwEAAaNQME4wHQYDVR0OBBYEFMy2MUOk6B9kN0nLDO4w7Ja/oL2dMB8GA1UdIwQYMBaAFMy2MUOk6B9kN0nLDO4w7Ja/oL2dMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHWk0SZYofIu0HP96D2RFghS7bcFGoTzG4uOK8v9cYtM3f3NO5NlmMNYeLG3wbBA+7pZgmIEReZkGlGq4kR4PqulKE4yymyuzIEUYFwlHfxrWCIH7/A211WxTQRXBGT2h4+uwpqOOOUdd8KHBdRIzYKiNEBjUgbya9fObxPZK2jx7zUqqa7KneEXaZ86LqPQU6+dv3i4yZE7PkeJ3Pl5wVSIJ7dxIN+81YhfuL3poknqDYmJ4QHNMcbS3gBaTTsUAUyfPXlAbWaGdypAuzxkwt9etX/bExs/0k28REwtZo9q04R48Ejlv4ckKIOFY7aO8saseB4A/n/oLfrW+/8qBnM=urn:oasis:names:tc:SAML:2.0:nameid-format:persistent - beakerstg id = https://beaker.stg.fedoraproject.org/saml2 beakerstg type = SP beakerstg name = Beaker STG