releng: merge composers into releng-compose to reduce duplication

4 files changed, 67 insertions, 80 deletions

diff --git a/inventory/group_vars/composers b/inventory/group_vars/composers
deleted file mode 100644
index 7976593db..000000000
--- a/inventory/group_vars/composers
+++ /dev/null
@@ -1,72 +0,0 @@
----
-# common items for the releng-* boxes
-lvm_size: 100000
-mem_size: 16384
-num_cpus: 16
-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-fedora-23
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/
-virt_install_command: "{{ virt_install_command_two_nic }}"
-
-# With 16 cpus, theres a bunch more kernel threads
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
-
-sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-
-host_group: releng
-
-# These are consumed by a task in roles/fedmsg/base/main.yml
-fedmsg_certs:
-- service: shell
-  owner: root
-  group: root
-  can_send:
-  - logger.log
-- service: releng
-  owner: root
-  group: masher
-  can_send:
-  - compose.branched.complete
-  - compose.branched.mash.complete
-  - compose.branched.mash.start
-  - compose.branched.image.complete
-  - compose.branched.image.start
-  - compose.branched.pungify.complete
-  - compose.branched.pungify.start
-  - compose.branched.rsync.complete
-  - compose.branched.rsync.start
-  - compose.branched.start
-  - compose.epelbeta.complete
-  - compose.rawhide.complete
-  - compose.rawhide.mash.complete
-  - compose.rawhide.mash.start
-  - compose.rawhide.image.complete
-  - compose.rawhide.image.start
-  - compose.rawhide.pungify.complete
-  - compose.rawhide.pungify.start
-  - compose.rawhide.rsync.complete
-  - compose.rawhide.rsync.start
-  - compose.rawhide.start
-  # Then there are *all these* make-updates things from releng+cloudsig
-  - compose.23.make-updates.start
-  - compose.23.make-updates.done
-  - compose.23.cloudimg-build.start
-  - compose.23.cloudimg-build.done
-  - compose.23.mash-atomic.start
-  - compose.23.mash-atomic.stop
-  - compose.23.atomic-lorax.start
-  - compose.23.atomic-lorax.done
-  - compose.23.cloudimg-checksum.start
-  - compose.23.cloudimg-checksum.done
-  - compose.23.cloudimg-staging.start
-  - compose.23.cloudimg-staging.done
-
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
-
-koji_server_url: "http://koji.fedoraproject.org/kojihub"
-koji_weburl: "http://koji.fedoraproject.org/koji"
-koji_topurl: "http://kojipkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/releng-compose b/inventory/group_vars/releng-compose
index f19d9fec9..de27e5a19 100644
--- a/inventory/group_vars/releng-compose
+++ b/inventory/group_vars/releng-compose
@@ -1,9 +1,23 @@
 ---
+# common items for the releng-* boxes
+lvm_size: 100000
+mem_size: 16384
+num_cpus: 16
+nm: 255.255.255.0
+gw: 10.5.125.254
+dns: 10.5.126.21
+
+# With 16 cpus, theres a bunch more kernel threads
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
+
 host_group: releng
 fas_client_groups: sysadmin-releng
 freezes: true
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
+
 # For the mock config
 kojipkgs_url: kojipkgs.fedoraproject.org
 kojihub_url: koji.fedoraproject.org/kojihub
@@ -13,3 +27,50 @@ kojihub_scheme: https
 koji_server_url: "http://koji.fedoraproject.org/kojihub"
 koji_weburl: "http://koji.fedoraproject.org/koji"
 koji_topurl: "http://kojipkgs.fedoraproject.org/"
+
+# These are consumed by a task in roles/fedmsg/base/main.yml
+fedmsg_certs:
+- service: shell
+  owner: root
+  group: root
+  can_send:
+  - logger.log
+- service: releng
+  owner: root
+  group: masher
+  can_send:
+  - compose.branched.complete
+  - compose.branched.mash.complete
+  - compose.branched.mash.start
+  - compose.branched.image.complete
+  - compose.branched.image.start
+  - compose.branched.pungify.complete
+  - compose.branched.pungify.start
+  - compose.branched.rsync.complete
+  - compose.branched.rsync.start
+  - compose.branched.start
+  - compose.epelbeta.complete
+  - compose.rawhide.complete
+  - compose.rawhide.mash.complete
+  - compose.rawhide.mash.start
+  - compose.rawhide.image.complete
+  - compose.rawhide.image.start
+  - compose.rawhide.pungify.complete
+  - compose.rawhide.pungify.start
+  - compose.rawhide.rsync.complete
+  - compose.rawhide.rsync.start
+  - compose.rawhide.start
+  # Then there are *all these* make-updates things from releng+cloudsig
+  - compose.23.make-updates.start
+  - compose.23.make-updates.done
+  - compose.23.cloudimg-build.start
+  - compose.23.cloudimg-build.done
+  - compose.23.mash-atomic.start
+  - compose.23.mash-atomic.stop
+  - compose.23.atomic-lorax.start
+  - compose.23.atomic-lorax.done
+  - compose.23.cloudimg-checksum.start
+  - compose.23.cloudimg-checksum.done
+  - compose.23.cloudimg-staging.start
+  - compose.23.cloudimg-staging.done
+
diff --git a/inventory/group_vars/composers-stg b/inventory/group_vars/releng-stg
index 121e44e61..121e44e61 100644
--- a/inventory/group_vars/composers-stg
+++ b/inventory/group_vars/releng-stg
diff --git a/inventory/inventory b/inventory/inventory
index 54d205525..2b92f11a1 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -31,11 +31,16 @@ arm03-qa01.cloud.fedoraproject.org
 
 [releng-compose]
 compose-x86-01.phx2.fedoraproject.org
+branched-composer.phx2.fedoraproject.org
+rawhide-composer.phx2.fedoraproject.org
 
 [releng-secondary]
 compose-aarch64-01.arm.fedoraproject.org
 compose-ppc64-01.ppc.fedoraproject.org
-# compose-ppc64le-01.ppc.fedoraproject.org
+compose-ppc64le-01.ppc.fedoraproject.org
+
+[releng-stg]
+composer.stg.phx2.fedoraproject.org
 
 [retrace]
 arm01-retrace01.arm.fedoraproject.org
@@ -210,13 +215,6 @@ bodhi-backend02.phx2.fedoraproject.org
 [bodhi-backend-stg]
 bodhi-backend01.stg.phx2.fedoraproject.org
 
-[composers]
-branched-composer.phx2.fedoraproject.org
-rawhide-composer.phx2.fedoraproject.org
-
-[composers-stg]
-composer.stg.phx2.fedoraproject.org
-
 [sign-bridge]
 sign-bridge01.phx2.fedoraproject.org
 sign-bridge01.stg.phx2.fedoraproject.org