From 9250d24c8eeb7357a2a377d3bb2604a93ee0321f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 6 Feb 2020 18:00:18 +0000 Subject: [PATCH] openstack: remove ansiblemagazine, artboard, commops Signed-off-by: Kevin Fenzi --- inventory/cloud | 3 - .../ansiblemagazine.fedorainfracloud.org | 30 ---- .../host_vars/artboard.fedorainfracloud.org | 24 ---- .../host_vars/commops.fedorainfracloud.org | 18 --- inventory/inventory | 6 - master.yml | 3 - .../ansiblemagazine.fedorainfracloud.org.yml | 73 ---------- .../hosts/artboard.fedorainfracloud.org.yml | 128 ------------------ .../hosts/commops.fedorainfracloud.org.yml | 32 ----- 9 files changed, 317 deletions(-) delete mode 100644 inventory/host_vars/ansiblemagazine.fedorainfracloud.org delete mode 100644 inventory/host_vars/artboard.fedorainfracloud.org delete mode 100644 inventory/host_vars/commops.fedorainfracloud.org delete mode 100644 playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml delete mode 100644 playbooks/hosts/artboard.fedorainfracloud.org.yml delete mode 100644 playbooks/hosts/commops.fedorainfracloud.org.yml diff --git a/inventory/cloud b/inventory/cloud index a2958e0e8f..ac297e43f0 100644 --- a/inventory/cloud +++ b/inventory/cloud @@ -34,14 +34,11 @@ storinator01.fedorainfracloud.org ## ## Clients ## -ansiblemagazine.fedorainfracloud.org arm03-packager00.cloud.fedoraproject.org arm03-packager01.cloud.fedoraproject.org arm03-qa00.cloud.fedoraproject.org arm03-qa01.cloud.fedoraproject.org -artboard.fedorainfracloud.org cloud-noc01.cloud.fedoraproject.org -commops.fedorainfracloud.org copr-be.cloud.fedoraproject.org copr-be-dev.cloud.fedoraproject.org copr-be-stg.fedorainfracloud.org diff --git a/inventory/host_vars/ansiblemagazine.fedorainfracloud.org b/inventory/host_vars/ansiblemagazine.fedorainfracloud.org deleted file mode 100644 index 3b0b619674..0000000000 --- a/inventory/host_vars/ansiblemagazine.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: ansiblemagazine -hostbase: ansiblemagazine -public_ip: 209.132.184.238 -root_auth_users: gdk rbergero pfrields -description: Ansible Magazine - -host_backup_targets: ['/var/www/html'] -db_backup_dir: ['/backups'] -dbs_to_backup: ['wp'] -mariadb_root_password: "{{ ansiblemagazine_db_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/artboard.fedorainfracloud.org b/inventory/host_vars/artboard.fedorainfracloud.org deleted file mode 100644 index 8972746f0e..0000000000 --- a/inventory/host_vars/artboard.fedorainfracloud.org +++ /dev/null @@ -1,24 +0,0 @@ ---- -image: rhel7-20141015 -instance_type: m1.small -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] -ansible_ifcfg_blacklist: true - -inventory_tenant: persistent -inventory_instance_name: artboard -hostbase: artboard -public_ip: 209.132.184.61 -root_auth_users: duffy -description: artboard server -datacenter: cloud - -volumes: - - volume_id: 44956766-0ecb-496d-8d3c-f43e89b7f268 - device: /dev/vdc - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" diff --git a/inventory/host_vars/commops.fedorainfracloud.org b/inventory/host_vars/commops.fedorainfracloud.org deleted file mode 100644 index 679851c81f..0000000000 --- a/inventory/host_vars/commops.fedorainfracloud.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -image: "{{ fedora27_x86_64 }}" -instance_type: m1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,web-443-anywhere-persistent,all-icmp-persistent,default -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: persistent -inventory_instance_name: commops -hostbase: commops -public_ip: 209.132.184.152 -root_auth_users: skamath bee2502 jflory7 -description: commops stats gathering instance - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" diff --git a/inventory/inventory b/inventory/inventory index 069da6622d..ab896daa16 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -997,8 +997,6 @@ pdc-backend02.stg.phx2.fedoraproject.org pdc-backend03.stg.phx2.fedoraproject.org [persistent_cloud] -# artboard instance -artboard.fedorainfracloud.org # copr production instances copr-be.cloud.fedoraproject.org copr-fe.cloud.fedoraproject.org @@ -1008,8 +1006,6 @@ copr-be-dev.cloud.fedoraproject.org copr-fe-dev.cloud.fedoraproject.org # fas2-dev fas2-dev.fedorainfracloud.org -# Ansible Magazine -ansiblemagazine.fedorainfracloud.org # Fedora Bootstrap VM fedora-bootstrap.fedorainfracloud.org # lists development instance @@ -1020,8 +1016,6 @@ java-deptools.fedorainfracloud.org developer.fedorainfracloud.org # iddev iddev.fedorainfracloud.org -# commops - ticket 5380 -commops.fedorainfracloud.org # respins respins.fedorainfracloud.org # upstreamfirst - ticket 6066 diff --git a/master.yml b/master.yml index a50e9e8403..f235fe9485 100644 --- a/master.yml +++ b/master.yml @@ -114,9 +114,7 @@ # host playbooks # -- 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/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 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml @@ -124,7 +122,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/hosts/grobisplitter01.phx2.fedoraproject.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/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 - import_playbook: /srv/web/infra/ansible/playbooks/hosts/testdays.fedorainfracloud.org.yml diff --git a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml deleted file mode 100644 index 17d0514d00..0000000000 --- a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml +++ /dev/null @@ -1,73 +0,0 @@ -- name: check/create instance - hosts: ansiblemagazine.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: ansiblemagazine.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 - - roles: - - basessh - - nagios_client - - mariadb_server - - post_tasks: - - name: create databaseuser - mysql_user: name=ansiblemagazine - host=localhost - state=present - password="{{ ansiblemagazine_db_password }}" - priv="ansiblemagazine.*:ALL" - - - name: Wordpress cron - cron: name="Wordpress cron" - minute="*/10" - job="curl -s http://localhost:80/wp-cron.php >/dev/null" diff --git a/playbooks/hosts/artboard.fedorainfracloud.org.yml b/playbooks/hosts/artboard.fedorainfracloud.org.yml deleted file mode 100644 index fa3dae7058..0000000000 --- a/playbooks/hosts/artboard.fedorainfracloud.org.yml +++ /dev/null @@ -1,128 +0,0 @@ -- name: check/create instance - hosts: artboard.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: artboard.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}}" - - roles: - - basessh - - tasks: - - - name: Install common scripts - copy: src={{ item }} dest=/usr/local/bin/ owner=root group=root mode=0755 - with_fileglob: - - "{{ roles_path }}/base/files/common-scripts/*" - tags: - - config - - base - - artboard - - - name: set sebooleans so artboard can talk to the db - seboolean: name=httpd_can_network_connect_db state=true persistent=true - tags: - - selinux - - artboard - - - name: mount up disk of persistent storage - mount: name=/srv/persist src='LABEL=artboard' fstype=ext4 state=mounted - tags: - - artboard - - - name: check the selinux context of the artboard dirs - command: matchpathcon "/srv/persist/artboard/(.*)" - register: webcontext - check_mode: no - changed_when: false - tags: - - config - - selinux - - artboard - - - name: set the SELinux policy for the artboard web dir - command: semanage fcontext -a -t httpd_sys_content_t "/srv/persist/artboard/(.*)" - when: webcontext.stdout.find('httpd_sys_content_t') == -1 - tags: - - config - - selinux - - artboard - - # packages needed - - name: add packages - package: state=present name={{ item }} - with_items: - - rsync - - openssh-clients - - httpd - - httpd-tools - - php - - php-gd - - php-mysql - - cronie-noanacron - - mod_ssl - tags: - - artboard - - # packages needed to be gone - - name: erase packages - package: state=absent name={{ item }} - with_items: - - cronie-anacron - tags: - - artboard - - - name: artboard backup thing - copy: src="{{ files }}/artboard/artboard-backup" dest=/etc/cron.daily/artboard-backup mode=0755 - tags: - - artboard - - - name: make artboard subdir - file: path=/srv/persist/artboard mode=0755 state=directory - tags: - - artboard - - - name: link artboard into /var/www/html - file: state=link src=/srv/persist/artboard path=/var/www/html/artboard - tags: - - artboard - - - name: add apache confs - copy: src="{{ files }}/artboard/{{ item }}" dest="/etc/httpd/conf.d/{{ item }}" backup=true - with_items: - - artboard.conf - - redirect.conf - notify: reload httpd - tags: - - artboard - - - name: startup apache - service: name=httpd state=started - tags: - - artboard - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/commops.fedorainfracloud.org.yml b/playbooks/hosts/commops.fedorainfracloud.org.yml deleted file mode 100644 index bea8320622..0000000000 --- a/playbooks/hosts/commops.fedorainfracloud.org.yml +++ /dev/null @@ -1,32 +0,0 @@ -- name: check/create instance - hosts: commops.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: commops.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}}" - - roles: - - basessh