From d4a5f649fdf10270e58d4f2baa9f8497c6306e3d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 Feb 2017 21:47:24 +0000 Subject: [PATCH] first cut at maintainer-test machines in cloud --- .../host_vars/f24-test.fedorainfracloud.org | 17 +++++ .../host_vars/f25-test.fedorainfracloud.org | 17 +++++ .../host_vars/ppc64-test.fedorainfracloud.org | 17 +++++ .../ppc64le-test.fedorainfracloud.org | 17 +++++ .../rawhide-test.fedorainfracloud.org | 18 +++++ inventory/inventory | 7 ++ master.yml | 2 +- playbooks/groups/arm-packager.yml | 45 ------------ playbooks/groups/maintainer-test.yml | 70 +++++++++++++++++++ 9 files changed, 164 insertions(+), 46 deletions(-) create mode 100644 inventory/host_vars/f24-test.fedorainfracloud.org create mode 100644 inventory/host_vars/f25-test.fedorainfracloud.org create mode 100644 inventory/host_vars/ppc64-test.fedorainfracloud.org create mode 100644 inventory/host_vars/ppc64le-test.fedorainfracloud.org create mode 100644 inventory/host_vars/rawhide-test.fedorainfracloud.org delete mode 100644 playbooks/groups/arm-packager.yml create mode 100644 playbooks/groups/maintainer-test.yml diff --git a/inventory/host_vars/f24-test.fedorainfracloud.org b/inventory/host_vars/f24-test.fedorainfracloud.org new file mode 100644 index 0000000000..e68ba4353d --- /dev/null +++ b/inventory/host_vars/f24-test.fedorainfracloud.org @@ -0,0 +1,17 @@ +--- +image: "{{ fedora24_x86_64 }}" +instance_type: ms1.medium +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-maintainertest,web-80-anywhere-maintainertest,default,web-443-anywhere-maintainertest,all-icmp-maintainertest +zone: nova +tcp_ports: [22] + +inventory_tenant: maintainertest +inventory_instance_name: f24-test +hostbase: f24-test +public_ip: 209.132.184.210 +description: f24-test instance + +cloud_networks: + # maintainertest-net + - net-id: "a512d096-3fa2-49cc-b989-d43ca687f91d" diff --git a/inventory/host_vars/f25-test.fedorainfracloud.org b/inventory/host_vars/f25-test.fedorainfracloud.org new file mode 100644 index 0000000000..c9197333f3 --- /dev/null +++ b/inventory/host_vars/f25-test.fedorainfracloud.org @@ -0,0 +1,17 @@ +--- +image: "{{ fedora25_x86_64 }}" +instance_type: ms1.medium +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-maintainertest,web-80-anywhere-maintainertest,default,web-443-anywhere-maintainertest,all-icmp-maintainertest +zone: nova +tcp_ports: [22] + +inventory_tenant: maintainertest +inventory_instance_name: f25-test +hostbase: f25-test +public_ip: 209.132.184.211 +description: f25-test instance + +cloud_networks: + # maintainertest-net + - net-id: "a512d096-3fa2-49cc-b989-d43ca687f91d" diff --git a/inventory/host_vars/ppc64-test.fedorainfracloud.org b/inventory/host_vars/ppc64-test.fedorainfracloud.org new file mode 100644 index 0000000000..3469ea5291 --- /dev/null +++ b/inventory/host_vars/ppc64-test.fedorainfracloud.org @@ -0,0 +1,17 @@ +--- +image: Fedora-Cloud-Base-25-1.2.ppc64.qcow2 +instance_type: ms1.medium +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-maintainertest,web-80-anywhere-maintainertest,default,web-443-anywhere-maintainertest,all-icmp-maintainertest +zone: nova +tcp_ports: [22] + +inventory_tenant: maintainertest +inventory_instance_name: ppc64-test +hostbase: ppc64-test +public_ip: 209.132.184.214 +description: ppc64-test instance + +cloud_networks: + # maintainertest-net + - net-id: "a512d096-3fa2-49cc-b989-d43ca687f91d" diff --git a/inventory/host_vars/ppc64le-test.fedorainfracloud.org b/inventory/host_vars/ppc64le-test.fedorainfracloud.org new file mode 100644 index 0000000000..9bb4be61b2 --- /dev/null +++ b/inventory/host_vars/ppc64le-test.fedorainfracloud.org @@ -0,0 +1,17 @@ +--- +image: Fedora-Cloud-Base-25-1.2.ppc64le.qcow2 +instance_type: ms1.medium +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-maintainertest,web-80-anywhere-maintainertest,default,web-443-anywhere-maintainertest,all-icmp-maintainertest +zone: nova +tcp_ports: [22] + +inventory_tenant: maintainertest +inventory_instance_name: ppc64le-test +hostbase: ppc64le-test +public_ip: 209.132.184.213 +description: ppc64le-test instance + +cloud_networks: + # maintainertest-net + - net-id: "a512d096-3fa2-49cc-b989-d43ca687f91d" diff --git a/inventory/host_vars/rawhide-test.fedorainfracloud.org b/inventory/host_vars/rawhide-test.fedorainfracloud.org new file mode 100644 index 0000000000..cdc3b19a09 --- /dev/null +++ b/inventory/host_vars/rawhide-test.fedorainfracloud.org @@ -0,0 +1,18 @@ +--- +# Note that we just start from this image, we have to upgrade from there. +image: "{{ fedora25_x86_64 }}" +instance_type: ms1.medium +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-maintainertest,web-80-anywhere-maintainertest,default,web-443-anywhere-maintainertest,all-icmp-maintainertest +zone: nova +tcp_ports: [22] + +inventory_tenant: maintainertest +inventory_instance_name: rawhide-test +hostbase: rawhide-test +public_ip: 209.132.184.212 +description: rawhide-test instance + +cloud_networks: + # maintainertest-net + - net-id: "a512d096-3fa2-49cc-b989-d43ca687f91d" diff --git a/inventory/inventory b/inventory/inventory index e05470cd8a..6ca158d3d7 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1167,6 +1167,13 @@ respins.fedorainfracloud.org # testdays.fedorainfracloud.org +[maintainer-test] +f24-test.fedorainfracloud.org +f25-test.fedorainfracloud.org +rawhide-test.fedorainfracloud.org +ppc64-test.fedorainfracloud.org +ppc64le-test.fedorainfracloud.org + [jenkins-master] jenkins.fedorainfracloud.org diff --git a/master.yml b/master.yml index 77f022968f..b4affc22d0 100644 --- a/master.yml +++ b/master.yml @@ -13,7 +13,6 @@ # group playbooks - include: /srv/web/infra/ansible/playbooks/groups/anitya.yml -- include: /srv/web/infra/ansible/playbooks/groups/arm-packager.yml - include: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml - include: /srv/web/infra/ansible/playbooks/groups/ask.yml - include: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml @@ -68,6 +67,7 @@ - include: /srv/web/infra/ansible/playbooks/groups/koschei-web.yml - include: /srv/web/infra/ansible/playbooks/groups/logserver.yml - include: /srv/web/infra/ansible/playbooks/groups/mailman.yml +- include: /srv/web/infra/ansible/playbooks/groups/maintainer-test.yml - include: /srv/web/infra/ansible/playbooks/groups/mariadb-server.yml - include: /srv/web/infra/ansible/playbooks/groups/mdapi.yml - include: /srv/web/infra/ansible/playbooks/groups/mirrorlist2.yml diff --git a/playbooks/groups/arm-packager.yml b/playbooks/groups/arm-packager.yml deleted file mode 100644 index f83a83f3f8..0000000000 --- a/playbooks/groups/arm-packager.yml +++ /dev/null @@ -1,45 +0,0 @@ - -- name: Setup arm-packager hosts - hosts: arm-packager - user: root - gather_facts: True - tags: - - arm-packager - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - pre_tasks: - - include: "{{ tasks }}/yumrepos.yml" - - roles: - - base - - rkhunter - - hosts - - fas_client - - sudo - - tasks: - # this is how you include other task lists - - include: "{{ tasks }}/motd.yml" - - - name: install packager tools (dnf) - dnf: state=present pkg={{ item }} - with_items: - - fedora-packager - when: ansible_distribution_major_version|int > 21 - tags: - - packages - - - name: allow packagers to use mock - lineinfile: dest=/etc/pam.d/mock line="{{ item }} sufficient pam_succeed_if.so user ingroup packager use_uid quiet" insertbefore=BOF - with_items: - - account - - auth - tags: - - config - - handlers: - - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml new file mode 100644 index 0000000000..a685bea230 --- /dev/null +++ b/playbooks/groups/maintainer-test.yml @@ -0,0 +1,70 @@ +- name: Spin up maintainertest cloud instances + hosts: maintainer-test + 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: Do some basic cloud setup on them + hosts: maintainer-test + 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) + hostname: name="{{inventory_hostname}}" + +- name: Setup maintainer test hosts + hosts: arm-packager:maintainer-test + gather_facts: True + tags: + - maintainer-test + + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - "/srv/private/ansible/vars.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + + pre_tasks: + - include: "{{ tasks }}/yumrepos.yml" + + roles: + - base + - rkhunter + - hosts + - fas_client + - sudo + + tasks: + # this is how you include other task lists + - include: "{{ tasks }}/motd.yml" + + - name: install packager tools (dnf) + dnf: state=present pkg={{ item }} + with_items: + - fedora-packager + when: ansible_distribution_major_version|int > 21 + tags: + - packages + + - name: allow packagers to use mock + lineinfile: dest=/etc/pam.d/mock line="{{ item }} sufficient pam_succeed_if.so user ingroup packager use_uid quiet" insertbefore=BOF + with_items: + - account + - auth + tags: + - config + + handlers: + - include: "{{ handlers }}/restart_services.yml"