From 935676020fc3a5d7d74e479ec3eb6c6d907166ec Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 14 Jul 2015 19:58:41 +0000 Subject: [PATCH] Drop old artboard it's not needed anymore. --- inventory/host_vars/209.132.184.143 | 12 --- inventory/inventory | 2 - master.yml | 2 +- .../artboard.cloud.fedoraproject.org.yml | 78 ------------------- 4 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 inventory/host_vars/209.132.184.143 delete mode 100644 playbooks/hosts/artboard.cloud.fedoraproject.org.yml diff --git a/inventory/host_vars/209.132.184.143 b/inventory/host_vars/209.132.184.143 deleted file mode 100644 index aa0ef6e282..0000000000 --- a/inventory/host_vars/209.132.184.143 +++ /dev/null @@ -1,12 +0,0 @@ ---- -instance_type: m1.small -image: "{{ el6_qcow_id }}" -keypair: fedora-admin-20130801 -security_group: webserver -zone: nova -hostbase: artboard- -public_ip: 209.132.184.143 -root_auth_users: duffy kevin -description: artboard cloud instance for the fedora art group -volumes: ['-d /dev/vdb vol-00000009'] -freezes: false diff --git a/inventory/inventory b/inventory/inventory index 54f7018dc0..ad717e6604 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -806,8 +806,6 @@ fed-cloud15.cloud.fedoraproject.org [persistent-cloud] #fedocal.dev.fedoraproject.org (oldcloud) 209.132.184.147 -#artboard.cloud.fedoraproject.org (oldcloud) -209.132.184.143 #elections-dev (oldcloud) 209.132.184.162 #shogun-ca.cloud.fedoraproject.org (oldcloud) diff --git a/master.yml b/master.yml index 47078bdf2c..352a26babc 100644 --- a/master.yml +++ b/master.yml @@ -109,7 +109,7 @@ # host playbooks # -- include: /srv/web/infra/ansible/playbooks/hosts/artboard.cloud.fedoraproject.org.yml +- include: /srv/web/infra/ansible/playbooks/hosts/artboard.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/darkserver-dev.cloud.fedoraproject.org.yml diff --git a/playbooks/hosts/artboard.cloud.fedoraproject.org.yml b/playbooks/hosts/artboard.cloud.fedoraproject.org.yml deleted file mode 100644 index 406981aded..0000000000 --- a/playbooks/hosts/artboard.cloud.fedoraproject.org.yml +++ /dev/null @@ -1,78 +0,0 @@ -- name: check/create instance - hosts: 209.132.184.143 - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - tasks: - - include: "{{ tasks }}/persistent_cloud.yml" - - include: "{{ tasks }}/growroot_cloud.yml" - -- name: provision instance - hosts: 209.132.184.143 - 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 - - tasks: - - include: "{{ tasks }}/cloud_setup_basic.yml" - - include: "{{ tasks }}/postfix_basic.yml" - - - name: mount up disk of persistent storage - action: mount name=/srv/persist src='LABEL=artboard' fstype=ext4 state=mounted - - # open up ports (22, 80, 443) - - name: poke holes in the firewall - action: command lokkit {{ item }} - with_items: - - --service=ssh - - --service=https - - --service=http - - # packages needed - - name: add packages - action: yum state=present name={{ item }} - with_items: - - rsync - - openssh-clients - - httpd - - httpd-tools - - php - - php-gd - - php-mysql - - cronie-noanacron - - # packages needed to be gone - - name: erase packages - action: yum state=absent name={{ item }} - with_items: - - cronie-anacron - - - name: artboard backup thing - action: copy src="{{ files }}/artboard/artboard-backup" dest=/etc/cron.daily/artboard-backup mode=0755 - - - name: make artboard subdir - action: file path=/srv/persist/artboard mode=0755 state=directory - - - name: link artboard into /var/www/html - action: file state=link src=/srv/persist/artboard path=/var/www/html/artboard - - - name: add apache confs - action: copy src="{{ files }}/artboard/{{ item }}" dest="/etc/httpd/conf.d/{{ item }}" backup=true - with_items: - - artboard.conf - - redirect.conf - notify: restart httpd - - - name: startup apache - action: service name=httpd state=started - - handlers: - - include: "{{ handlers }}/restart_services.yml"