diff --git a/inventory/backups b/inventory/backups index 79c4bf10a4..d072f1f8b8 100644 --- a/inventory/backups +++ b/inventory/backups @@ -25,6 +25,4 @@ value01.phx2.fedoraproject.org tang01.phx2.fedoraproject.org taskotron01.qa.fedoraproject.org nuancier01.phx2.fedoraproject.org -magazine2.fedorainfracloud.org -communityblog.fedorainfracloud.org upstreamfirst.fedorainfracloud.org diff --git a/inventory/host_vars/communityblog.fedorainfracloud.org b/inventory/host_vars/communityblog.fedorainfracloud.org deleted file mode 100644 index d0a14c5635..0000000000 --- a/inventory/host_vars/communityblog.fedorainfracloud.org +++ /dev/null @@ -1,24 +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,all-icmp-persistent -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: persistent -inventory_instance_name: communityblog -hostbase: communityblog -public_ip: 209.132.184.207 -root_auth_users: nb chrisroberts jflory7 -description: fedora community blog - -host_backup_targets: ['/var/www/html'] -db_backup_dir: ['/backups'] -dbs_to_backup: ['wp'] -mariadb_root_password: "{{ communityblog_mariadb_password }}" -extra_enablerepos: '' - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" diff --git a/inventory/host_vars/magazine2.fedorainfracloud.org b/inventory/host_vars/magazine2.fedorainfracloud.org deleted file mode 100644 index 4dac064cd1..0000000000 --- a/inventory/host_vars/magazine2.fedorainfracloud.org +++ /dev/null @@ -1,30 +0,0 @@ ---- -image: rhel7-20141015 -instance_type: m1.large -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,web-443-anywhere-persistent,allow-nagios-persistent,default,all-icmp-persistent -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: persistent -inventory_instance_name: magazine2 -hostbase: magazine2 -public_ip: 209.132.184.52 -root_auth_users: nb chrisroberts pfrields -description: Fedora Magazine - -host_backup_targets: ['/var/www/html'] -db_backup_dir: ['/backups'] -dbs_to_backup: ['wp'] -mariadb_root_password: "{{ magazine_mariadb_password }}" -extra_enablerepos: '' - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" - -nagios_Check_Services: - nrpe: true - sshd: true - httpd: true - swap: false diff --git a/inventory/host_vars/twisted-fedora26-1.fedorainfracloud.org b/inventory/host_vars/twisted-fedora26-1.fedorainfracloud.org deleted file mode 100644 index bf494caca8..0000000000 --- a/inventory/host_vars/twisted-fedora26-1.fedorainfracloud.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -image: "{{ fedora26_x86_64 }}" -instance_type: m1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-pythonbots,all-icmp-pythonbots,default -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: pythonbots -inventory_instance_name: twisted-fedora26-1 -hostbase: twisted-fedora26-1 -public_ip: 209.132.184.185 -description: twisted buildbot for fedora 26 - -cloud_networks: - # pythonbots-net - - net-id: "36ca66de-001d-4807-a688-58c363d84d68" diff --git a/inventory/host_vars/twisted-fedora26-2.fedorainfracloud.org b/inventory/host_vars/twisted-fedora26-2.fedorainfracloud.org deleted file mode 100644 index 02fe970255..0000000000 --- a/inventory/host_vars/twisted-fedora26-2.fedorainfracloud.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -image: "{{ fedora26_x86_64 }}" -instance_type: m1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-pythonbots,all-icmp-pythonbots,default -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: pythonbots -inventory_instance_name: twisted-fedora26-2 -hostbase: twisted-fedora26-2 -public_ip: 209.132.184.186 -description: twisted buildbot for fedora 26 - -cloud_networks: - # pythonbots-net - - net-id: "36ca66de-001d-4807-a688-58c363d84d68" diff --git a/inventory/host_vars/twisted-fedora27-1.fedorainfracloud.org b/inventory/host_vars/twisted-fedora27-1.fedorainfracloud.org deleted file mode 100644 index d3e2ba8dad..0000000000 --- a/inventory/host_vars/twisted-fedora27-1.fedorainfracloud.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -image: "{{ fedora27_x86_64 }}" -instance_type: m1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-pythonbots,all-icmp-pythonbots,default -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: pythonbots -inventory_instance_name: twisted-fedora27-1 -hostbase: twisted-fedora27-1 -public_ip: 209.132.184.90 -description: twisted buildbot for fedora 27 - -cloud_networks: - # pythonbots-net - - net-id: "36ca66de-001d-4807-a688-58c363d84d68" diff --git a/inventory/host_vars/twisted-fedora27-2.fedorainfracloud.org b/inventory/host_vars/twisted-fedora27-2.fedorainfracloud.org deleted file mode 100644 index d7d6952866..0000000000 --- a/inventory/host_vars/twisted-fedora27-2.fedorainfracloud.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -image: "{{ fedora27_x86_64 }}" -instance_type: m1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-pythonbots,all-icmp-pythonbots,default -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: pythonbots -inventory_instance_name: twisted-fedora27-1 -hostbase: twisted-fedora27-1 -public_ip: 209.132.184.113 -description: twisted buildbot for fedora 27 - -cloud_networks: - # pythonbots-net - - net-id: "36ca66de-001d-4807-a688-58c363d84d68" diff --git a/inventory/host_vars/twisted-rhel7-1.fedorainfracloud.org b/inventory/host_vars/twisted-rhel7-1.fedorainfracloud.org deleted file mode 100644 index bfac09bb35..0000000000 --- a/inventory/host_vars/twisted-rhel7-1.fedorainfracloud.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -image: rhel7-20141015 -instance_type: m1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-pythonbots,all-icmp-pythonbots,default -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: pythonbots -inventory_instance_name: twisted-rhel7-1 -hostbase: twisted-rhel7-1 -public_ip: 209.132.184.187 -description: twisted buildbot for rhel7 1 - -cloud_networks: - # pythonbots-net - - net-id: "36ca66de-001d-4807-a688-58c363d84d68" diff --git a/inventory/host_vars/twisted-rhel7-2.fedorainfracloud.org b/inventory/host_vars/twisted-rhel7-2.fedorainfracloud.org deleted file mode 100644 index a3bc4a42c4..0000000000 --- a/inventory/host_vars/twisted-rhel7-2.fedorainfracloud.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -image: rhel7-20141015 -instance_type: m1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-pythonbots,all-icmp-pythonbots,default -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: pythonbots -inventory_instance_name: twisted-rhel7-2 -hostbase: twisted-rhel7-2 -public_ip: 209.132.184.188 -description: twisted buildbot for rhel7 2 - -cloud_networks: - # pythonbots-net - - net-id: "36ca66de-001d-4807-a688-58c363d84d68" diff --git a/inventory/inventory b/inventory/inventory index a5c2f55bb7..65faa536a9 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1293,14 +1293,6 @@ pagure01.fedoraproject.org [pagure_stg] pagure-stg01.fedoraproject.org -[twisted_buildbots] -twisted-fedora26-1.fedorainfracloud.org -twisted-fedora26-2.fedorainfracloud.org -twisted-fedora27-1.fedorainfracloud.org -twisted-fedora27-2.fedorainfracloud.org -twisted-rhel7-1.fedorainfracloud.org -twisted-rhel7-2.fedorainfracloud.org - [infinote] infinote.fedoraproject.org diff --git a/master.yml b/master.yml index 343f563211..6978437236 100644 --- a/master.yml +++ b/master.yml @@ -128,7 +128,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/hosts/artboard.fedorainfracloud.org.yml #- import_playbook: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml -- import_playbook: /srv/web/infra/ansible/playbooks/hosts/communityblog.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/commops.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/developer.fedorainfracloud.org.yml @@ -138,7 +137,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/iddev.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml -- import_playbook: /srv/web/infra/ansible/playbooks/hosts/magazine2.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/regcfp2.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/respins.fedorainfracloud.org.yml diff --git a/playbooks/groups/twisted-buildbots.yml b/playbooks/groups/twisted-buildbots.yml deleted file mode 100644 index f24f660d17..0000000000 --- a/playbooks/groups/twisted-buildbots.yml +++ /dev/null @@ -1,36 +0,0 @@ -- name: check/create instances - hosts: twisted_buildbots - 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: twisted_buildbots - 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}}" - - tasks: - - - name: add twisted key - authorized_key: user=root key="{{ item }}" - with_file: - - /srv/web/infra/ansible/files/twisted/ssh-pub-key - tags: - - config - - sshkeys diff --git a/playbooks/hosts/communityblog.fedorainfracloud.org.yml b/playbooks/hosts/communityblog.fedorainfracloud.org.yml deleted file mode 100644 index e3b8924619..0000000000 --- a/playbooks/hosts/communityblog.fedorainfracloud.org.yml +++ /dev/null @@ -1,80 +0,0 @@ -- name: check/create instance - hosts: communityblog.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: - - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - -- name: setup all the things - hosts: communityblog.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: - - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - - name: set hostname (required by some services, at least postfix need it) - hostname: name="{{inventory_hostname}}" - - tasks: - - name: add packages - package: state=present name={{ item }} - with_items: - - httpd - - php - - php-mysql - - mariadb-server - - mariadb - - mod_ssl - - php-mcrypt - - php-mbstring - - wget - - unzip - - postfix - - wordpress - - git - - - name: enable httpd service - service: name=httpd enabled=yes state=started - - - name: configure postfix for ipv4 only - raw: postconf -e inet_protocols=ipv4 - - - name: enable local postfix service - service: name=postfix enabled=yes state=started - - - name: clone (or update) community blog theme - git: repo=https://pagure.io/communityblog-theme.git dest=/usr/share/wordpress/wp-content/themes/community-theme-git - - - name: ensure symlink exists for theme - file: src=/usr/share/wordpress/wp-content/themes/community-theme-git/community-theme dest=/usr/share/wordpress/wp-content/themes/communityblog-theme-0.02 state=link - - roles: - - basessh - - nagios_client - - mariadb_server - - post_tasks: - - name: create databaseuser - mysql_user: name=commbloguser - host=localhost - state=present - password="{{ communityblog_db_password }}" - priv="wp.*:ALL" - - - name: Wordpress cron - cron: name="Wordpress cron" - minute="*/10" - job="curl http://localhost:8008/wp-cron.php >/dev/null" diff --git a/playbooks/hosts/magazine2.fedorainfracloud.org.yml b/playbooks/hosts/magazine2.fedorainfracloud.org.yml deleted file mode 100644 index 6e0414b193..0000000000 --- a/playbooks/hosts/magazine2.fedorainfracloud.org.yml +++ /dev/null @@ -1,84 +0,0 @@ -- name: check/create instance - hosts: magazine2.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: - - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - -- name: setup all the things - hosts: magazine2.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: - - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - - name: set hostname (required by some services, at least postfix need it) - hostname: name="{{inventory_hostname}}" - - tasks: - - name: add packages - package: state=present name={{ item }} - with_items: - - httpd - - php - - php-mysql - - mariadb-server - - mariadb - - mod_ssl - - php-mcrypt - - php-mbstring - - wget - - unzip - - postfix - - wordpress - - - name: enable httpd service - service: name=httpd enabled=yes state=started - - - name: configure postfix for ipv4 only - raw: postconf -e inet_protocols=ipv4 - - - name: enable local postfix service - service: name=postfix enabled=yes state=started - - - name: allow httpd to send mail - seboolean: name=httpd_can_sendmail state=true persistent=true - - roles: - - basessh - - nagios_client - - mariadb_server - - post_tasks: - - name: create databaseuser - mysql_user: name=magazine - host=localhost - state=present - password="{{ magazine_db_password }}" - priv="magazine.*:ALL" - - - name: Wordpress cron - cron: name="Wordpress cron" - minute="*/10" - job="curl -s http://localhost:8008/wp-cron.php >/dev/null" - - - name: Wordpress nightly update check - cron: name="Wordpress nightly update check" - special_time="daily" - job="yum -y -q update wordpress" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml"