diff --git a/inventory/host_vars/darkserver-dev.cloud.fedoraproject.org b/inventory/host_vars/darkserver-dev.cloud.fedoraproject.org deleted file mode 100644 index 65c26f1421..0000000000 --- a/inventory/host_vars/darkserver-dev.cloud.fedoraproject.org +++ /dev/null @@ -1,16 +0,0 @@ -# 2cpus, 3GB of ram 20GB of ephemeral space -instance_type: m1.large -# image id -image: "{{ el6_qcow_id }}" -keypair: fedora-admin-20130801 -# what security group to add the host to -security_group: webserver -zone: fedoracloud -# instance id will be appended -hostbase: darkserver-dev- -# ip should be in the 209.132.184.XXX range -public_ip: 209.132.184.148 -# users/groups who should have root ssh access -root_auth_users: kushal @sysadmin-main sayanchowdhury -description: darkserver dev server -freezes: false diff --git a/inventory/host_vars/darkserver-dev.fedorainfracloud.org b/inventory/host_vars/darkserver-dev.fedorainfracloud.org new file mode 100644 index 0000000000..cad5fcbe6b --- /dev/null +++ b/inventory/host_vars/darkserver-dev.fedorainfracloud.org @@ -0,0 +1,18 @@ +--- +image: rhel7-20141015 +instance_type: m1.large +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default +zone: nova +tcp_ports: [22, 80, 443] + +inventory_tenant: persistent +inventory_instance_name: darkserver-dev +hostbase: darkserver-dev +public_ip: 209.132.184.171 +root_auth_users: kushal +description: darkserver development instance + +cloud_networks: + # persistent-net + - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" diff --git a/inventory/inventory b/inventory/inventory index bc9e63b8eb..15b08dafbc 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -805,8 +805,6 @@ fed-cloud15.cloud.fedoraproject.org [persistent-cloud] #shogun-ca.cloud.fedoraproject.org (oldcloud) 209.132.184.157 -# darkserver-dev (oldcloud) -darkserver-dev.cloud.fedoraproject.org # DevPi test instance - ticket 4524 (oldcloud) 209.132.184.166 # @@ -835,6 +833,8 @@ fas2-dev.fedorainfracloud.org fas3-dev.fedorainfracloud.org # faitout faitout.fedorainfracloud.org +# darkserver development instance +darkserver-dev.fedorainfracloud.org [jenkins-slaves] # EL-6 builder diff --git a/master.yml b/master.yml index c48e15bbb6..337d2299a6 100644 --- a/master.yml +++ b/master.yml @@ -110,7 +110,7 @@ - include: /srv/web/infra/ansible/playbooks/hosts/artboard.fedorainfracloud.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 +- include: /srv/web/infra/ansible/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/devpi.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/dopr-dev.cloud.fedoraproject.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml diff --git a/playbooks/hosts/darkserver-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/darkserver-dev.cloud.fedoraproject.org.yml deleted file mode 100644 index 5e23506a0c..0000000000 --- a/playbooks/hosts/darkserver-dev.cloud.fedoraproject.org.yml +++ /dev/null @@ -1,28 +0,0 @@ -- name: check/create instance - hosts: darkserver-dev.cloud.fedoraproject.org - 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" - -- name: provision instance - hosts: darkserver-dev.cloud.fedoraproject.org - 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" - # fill in other actions/includes/etc here - # - # handlers: - # - include: "{{ handlers }}/restart_services.yml diff --git a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml new file mode 100644 index 0000000000..cb1b22ca7b --- /dev/null +++ b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml @@ -0,0 +1,27 @@ +- name: check/create instance + hosts: darkserver-dev.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_new.yml" + - include: "{{ tasks }}/growroot_cloud_el7.yml" + +- name: setup all the things + hosts: darkserver-dev.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}}" diff --git a/tasks/growroot_cloud_el7.yml b/tasks/growroot_cloud_el7.yml new file mode 100644 index 0000000000..0879d95ecd --- /dev/null +++ b/tasks/growroot_cloud_el7.yml @@ -0,0 +1,30 @@ +- name: add infra repo + action: get_url url=http://infrastructure.fedoraproject.org/el/infrastructure.repo dest=/etc/yum.repos.d/ + when: is_rhel is defined + tags: + - config + +- name: install cloud-utils + yum: name=cloud-utils state=present + tags: + - packages + +- name: growpart the first partition (/) to full size + command: growpart /dev/vda 1 + register: growpart + always_run: true + changed_when: "growpart.rc != 1" + failed_when: growpart.rc == 2 + +- name: reboot the box + command: /sbin/reboot + when: growpart.rc == 0 + ignore_errors: true + +- name: wait for it to come back (should be quick) + local_action: wait_for host={{ inventory_hostname }} port=22 delay=10 timeout=120 + when: growpart.rc == 0 + +- name: resize the /dev/vda 1 fs + command: xfs_growfs / + when: growpart.rc == 0