From 7e32adcb08b8373ac0af241014b5bfb61d839277 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 27 Jun 2017 14:13:13 -0500 Subject: [PATCH] add osbs orchestrator cluster creation Signed-off-by: Adam Miller --- inventory/group_vars/osbsworker-masters-stg | 24 +++++++++++++++++++ inventory/group_vars/osbsworker-nodes-stg | 23 ++++++++++++++++++ ...worker-master01.stg.phx2.fedoraproject.org | 19 +++++++++++++++ ...bsworker-node01.stg.phx2.fedoraproject.org | 19 +++++++++++++++ ...bsworker-node02.stg.phx2.fedoraproject.org | 19 +++++++++++++++ inventory/inventory | 12 ++++++++++ playbooks/groups/osbs-cluster.yml | 4 ++-- 7 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 inventory/group_vars/osbsworker-masters-stg create mode 100644 inventory/group_vars/osbsworker-nodes-stg create mode 100644 inventory/host_vars/osbsworker-master01.stg.phx2.fedoraproject.org create mode 100644 inventory/host_vars/osbsworker-node01.stg.phx2.fedoraproject.org create mode 100644 inventory/host_vars/osbsworker-node02.stg.phx2.fedoraproject.org diff --git a/inventory/group_vars/osbsworker-masters-stg b/inventory/group_vars/osbsworker-masters-stg new file mode 100644 index 0000000000..c1e595cf37 --- /dev/null +++ b/inventory/group_vars/osbsworker-masters-stg @@ -0,0 +1,24 @@ +--- +# Define resources for this group of hosts here. +lvm_size: 60000 +mem_size: 8192 +num_cpus: 2 + +tcp_ports: [ 80, 443, 8443] + +fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran +sudoers: "{{ private }}/files/sudo/00releng-sudoers" + +docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org" +source_registry: "registry.stg.fedoraproject.org" +docker_registry: "candidate-registry.stg.fedoraproject.org" + +osbs_url: "osbs.stg.fedoraproject.org" +osbs_koji_username: "kojibuilder_stg" + +koji_url: "koji.stg.fedoraproject.org" + +osbs_client_conf_path: /etc/osbs.conf + +openshift_node_labels: {'region':'infra'} +openshift_schedulable: False diff --git a/inventory/group_vars/osbsworker-nodes-stg b/inventory/group_vars/osbsworker-nodes-stg new file mode 100644 index 0000000000..4bf8de294e --- /dev/null +++ b/inventory/group_vars/osbsworker-nodes-stg @@ -0,0 +1,23 @@ +--- +# Define resources for this group of hosts here. +lvm_size: 60000 +mem_size: 8192 +num_cpus: 2 + +tcp_ports: [ 80, 443, 8443, 10250] + +fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran +sudoers: "{{ private }}/files/sudo/00releng-sudoers" + +docker_cert_dir: "/etc/docker/certs.d/candidate-registry.stg.fedoraproject.org" +source_registry: "registry.stg.fedoraproject.org" +docker_registry: "candidate-registry.stg.fedoraproject.org" + +osbs_url: "osbs.stg.fedoraproject.org" +osbs_koji_username: "kojibuilder_stg" + +koji_url: "koji.stg.fedoraproject.org" + +osbs_client_conf_path: /etc/osbs.conf + +openshift_node_labels: {'region': 'primary', 'zone': 'default'} diff --git a/inventory/host_vars/osbsworker-master01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbsworker-master01.stg.phx2.fedoraproject.org new file mode 100644 index 0000000000..4f8e32b96b --- /dev/null +++ b/inventory/host_vars/osbsworker-master01.stg.phx2.fedoraproject.org @@ -0,0 +1,19 @@ +--- +nm: NETMASK +gw: GATEWAY +dns: DNS +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-osbs +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +volgroup: /dev/vg_guests +eth0_ip: IPADDR +vmhost: VIRTHOST +datacenter: phx2 +host_group: osbs-stg + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +lvm_size: 120g +mem_size: 8192 +max_mem_size: 16384 +num_cpus: 4 diff --git a/inventory/host_vars/osbsworker-node01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbsworker-node01.stg.phx2.fedoraproject.org new file mode 100644 index 0000000000..f8a42febe2 --- /dev/null +++ b/inventory/host_vars/osbsworker-node01.stg.phx2.fedoraproject.org @@ -0,0 +1,19 @@ +--- +nm: NETMASK +gw: GATEWAY +dns: DNS +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-osbs +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +volgroup: /dev/vg_guests +eth0_ip: IPADDR +vmhost: VIRTHOST +datacenter: phx2 +host_group: osbs-nodes-stg + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +lvm_size: 120g +mem_size: 8192 +max_mem_size: 16384 +num_cpus: 4 diff --git a/inventory/host_vars/osbsworker-node02.stg.phx2.fedoraproject.org b/inventory/host_vars/osbsworker-node02.stg.phx2.fedoraproject.org new file mode 100644 index 0000000000..f8a42febe2 --- /dev/null +++ b/inventory/host_vars/osbsworker-node02.stg.phx2.fedoraproject.org @@ -0,0 +1,19 @@ +--- +nm: NETMASK +gw: GATEWAY +dns: DNS +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-osbs +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +volgroup: /dev/vg_guests +eth0_ip: IPADDR +vmhost: VIRTHOST +datacenter: phx2 +host_group: osbs-nodes-stg + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +lvm_size: 120g +mem_size: 8192 +max_mem_size: 16384 +num_cpus: 4 diff --git a/inventory/inventory b/inventory/inventory index 0a8ce317ea..c7409dfc47 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -775,6 +775,9 @@ osbs-control01.stg.phx2.fedoraproject.org osbs-master01.stg.phx2.fedoraproject.org osbs-node01.stg.phx2.fedoraproject.org osbs-node02.stg.phx2.fedoraproject.org +osbsworker-x86-64-master01.stg.phx2.fedoraproject.org +osbsworker-x86-64-node01.stg.phx2.fedoraproject.org +osbsworker-x86-64-node02.stg.phx2.fedoraproject.org docker-registry01.stg.phx2.fedoraproject.org docker-registry02.stg.phx2.fedoraproject.org docker-candidate-registry01.stg.phx2.fedoraproject.org @@ -1328,10 +1331,17 @@ osbs-master01.phx2.fedoraproject.org [osbs-masters-stg] osbs-master01.stg.phx2.fedoraproject.org +[osbsworker-masters-stg] +osbsworker-x86-64-master01.stg.phx2.fedoraproject.org + [osbs-nodes-stg] osbs-node01.stg.phx2.fedoraproject.org osbs-node02.stg.phx2.fedoraproject.org +[osbsworker-nodes-stg] +osbsworker-x86-64-node01.stg.phx2.fedoraproject.org +osbsworker-x86-64-node02.stg.phx2.fedoraproject.org + [osbs:children] osbs-control osbs-nodes @@ -1341,6 +1351,8 @@ osbs-masters osbs-control-stg osbs-nodes-stg osbs-masters-stg +osbsworker-nodes-stg +osbsworker-masters-stg [os-control-stg] os-control01.stg.phx2.fedoraproject.org diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 1a90db8473..d1b5c01a6e 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -1,9 +1,9 @@ # create an osbs server - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-control-stg:osbs-control" -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-nodes-stg:osbs-masters-stg:osbs-nodes:osbs-masters" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-nodes-stg:osbs-masters-stg:osbs-nodes:osbs-masters:osbsworker-nodes-stg:osbsworker-masters-stg" - name: make the box be real - hosts: osbs-control:osbs-control-stg:osbs-masters-stg:osbs-nodes-stg:osbs-masters:osbs-nodes + hosts: osbs-control:osbs-control-stg:osbs-masters-stg:osbs-nodes-stg:osbs-masters:osbs-nodes:osbsworker-nodes-stg:osbsworker-masters-stg user: root gather_facts: True