diff --git a/inventory/group_vars/arm-releng b/inventory/group_vars/releng-compose similarity index 94% rename from inventory/group_vars/arm-releng rename to inventory/group_vars/releng-compose index 3d765fcb76..f0a7100fc3 100644 --- a/inventory/group_vars/arm-releng +++ b/inventory/group_vars/releng-compose @@ -1,7 +1,7 @@ --- host_group: releng fas_client_groups: sysadmin-releng -freezes: false +freezes: true # # These are 32bit # diff --git a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org new file mode 100644 index 0000000000..185d3e3177 --- /dev/null +++ b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org @@ -0,0 +1,22 @@ +nm: 255.255.255.0 +gw: 10.5.125.254 +dns: 10.5.126.21 + +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ + +lvm_size: 30000 +mem_size: 8192 +num_cpus: 8 + +volgroup: /dev/xenGuests +eth0_ip: 10.5.125.41 +vmhost: bvirthost10.phx2.fedoraproject.org +datacenter: phx2 + +fas_client_groups: sysadmin-noc,sysadmin-releng + +kojipkgs_url: koji.stg.fedoraproject.org +kojihub_url: koji.stg.fedoraproject.org/kojihub + +nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4 diff --git a/inventory/inventory b/inventory/inventory index 38c65d112d..766bc84016 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -21,8 +21,9 @@ arm03-packager01.cloud.fedoraproject.org arm03-qa00.cloud.fedoraproject.org arm03-qa01.cloud.fedoraproject.org -[arm-releng] +[releng-compose] arm01-releng00.arm.fedoraproject.org +compose-x86-01.phx2.fedoraproject.org compose-x86-02.phx2.fedoraproject.org [retrace] diff --git a/playbooks/groups/arm-releng.yml b/playbooks/groups/releng-compose.yml similarity index 53% rename from playbooks/groups/arm-releng.yml rename to playbooks/groups/releng-compose.yml index 288b77cc42..3130003281 100644 --- a/playbooks/groups/arm-releng.yml +++ b/playbooks/groups/releng-compose.yml @@ -1,10 +1,25 @@ +- name: make releng systems + hosts: compose-x86-01.phx2.fedoraproject.org + user: root + gather_facts: False -- name: Setup arm-releng hosts - hosts: arm-releng + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - "{{ private }}/vars.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + + tasks: + - include: "{{ tasks }}/virt_instance_create.yml" + + handlers: + - include: "{{ handlers }}/restart_services.yml" + +- name: Setup releng compose hosts + hosts: releng-compose user: root gather_facts: True tags: - - arm-releng + - releng-compose vars_files: - /srv/web/infra/ansible/vars/global.yml