From debce58aee409af8d8adca89d0dbd014794c3016 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 9 Jun 2020 22:02:07 -0700 Subject: [PATCH] iad2 / openshift: drop phx2 openshift and clean up openshift playbooks Signed-off-by: Kevin Fenzi --- inventory/inventory | 13 +++++-------- playbooks/openshift-apps/bodhi.yml | 2 +- playbooks/openshift-apps/compose-tracker.yml | 2 +- playbooks/openshift-apps/coreos-cincinnati.yml | 2 +- playbooks/openshift-apps/elections.yml | 2 +- playbooks/openshift-apps/fas.yml | 2 +- playbooks/openshift-apps/greenwave.yml | 2 +- playbooks/openshift-apps/ipsilon.yml | 2 +- playbooks/openshift-apps/mdapi.yml | 2 +- playbooks/openshift-apps/messaging-bridges.yml | 2 +- playbooks/openshift-apps/silverblue.yml | 2 +- playbooks/openshift-apps/waiverdb.yml | 2 +- 12 files changed, 16 insertions(+), 19 deletions(-) diff --git a/inventory/inventory b/inventory/inventory index c9508153e2..59f04a261a 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1181,24 +1181,21 @@ os-control01.phx2.fedoraproject.org os-control01.iad2.fedoraproject.org [os_masters] -os-master01.phx2.fedoraproject.org -os-master02.phx2.fedoraproject.org -os-master03.phx2.fedoraproject.org os-master01.iad2.fedoraproject.org os-master02.iad2.fedoraproject.org os-master03.iad2.fedoraproject.org [os_infra_nodes] -os-node01.phx2.fedoraproject.org -os-node02.phx2.fedoraproject.org -os-node03.phx2.fedoraproject.org os-node01.iad2.fedoraproject.org os-node02.iad2.fedoraproject.org os-node03.iad2.fedoraproject.org +os-node04.iad2.fedoraproject.org +os-node05.iad2.fedoraproject.org [os_nodes] -os-node04.phx2.fedoraproject.org -os-node05.phx2.fedoraproject.org +os-node01.iad2.fedoraproject.org +os-node02.iad2.fedoraproject.org +os-node03.iad2.fedoraproject.org os-node04.iad2.fedoraproject.org os-node05.iad2.fedoraproject.org diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index afc2b3e7f3..f160411bb7 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters[0]:os_masters_stg[0]:os-master01.iad2.fedoraproject.org + hosts: os_masters[0]:os_masters_stg[0] user: root gather_facts: False diff --git a/playbooks/openshift-apps/compose-tracker.yml b/playbooks/openshift-apps/compose-tracker.yml index 3855443b16..bcb6d8a8b7 100644 --- a/playbooks/openshift-apps/compose-tracker.yml +++ b/playbooks/openshift-apps/compose-tracker.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters[0]:os_masters_stg[0]:os-master01.iad2.fedoraproject.org + hosts: os_masters[0]:os_masters_stg[0] user: root gather_facts: False diff --git a/playbooks/openshift-apps/coreos-cincinnati.yml b/playbooks/openshift-apps/coreos-cincinnati.yml index 8e5a26b573..2ba3dd7b0d 100644 --- a/playbooks/openshift-apps/coreos-cincinnati.yml +++ b/playbooks/openshift-apps/coreos-cincinnati.yml @@ -1,5 +1,5 @@ - name: provision CoreOS Cincinnati backend - hosts: os_masters[0]:os_masters_stg[0]:os-master01.iad2.fedoraproject.org + hosts: os_masters[0]:os_masters_stg[0] user: root gather_facts: False diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index 7a910f9e27..bc608d0d1c 100644 --- a/playbooks/openshift-apps/elections.yml +++ b/playbooks/openshift-apps/elections.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters_stg[0]:os_masters[0]:os-master01.iad2.fedoraproject.org + hosts: os_masters_stg[0]:os_masters[0] user: root gather_facts: False diff --git a/playbooks/openshift-apps/fas.yml b/playbooks/openshift-apps/fas.yml index 4585890630..caedde604e 100644 --- a/playbooks/openshift-apps/fas.yml +++ b/playbooks/openshift-apps/fas.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters[0]:os_masters_stg[0]:os-master01.iad2.fedoraproject.org + hosts: os_masters[0]:os_masters_stg[0] user: root gather_facts: False diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index 46a9c518f2..ee3d8ddeb0 100644 --- a/playbooks/openshift-apps/greenwave.yml +++ b/playbooks/openshift-apps/greenwave.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters[0]:os_masters_stg[0]:os-master01.iad2.fedoraproject.org + hosts: os_masters[0]:os_masters_stg[0] user: root gather_facts: False diff --git a/playbooks/openshift-apps/ipsilon.yml b/playbooks/openshift-apps/ipsilon.yml index b103a4bc0f..91468577a4 100644 --- a/playbooks/openshift-apps/ipsilon.yml +++ b/playbooks/openshift-apps/ipsilon.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters[0]:os_masters_stg[0]:os-master01.iad2.fedoraproject.org + hosts: os_masters[0]:os_masters_stg[0] user: root gather_facts: False diff --git a/playbooks/openshift-apps/mdapi.yml b/playbooks/openshift-apps/mdapi.yml index 96f8bacc40..4d99ac982c 100644 --- a/playbooks/openshift-apps/mdapi.yml +++ b/playbooks/openshift-apps/mdapi.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters_stg[0]:os_masters:os-master01.iad2.fedoraproject.org + hosts: os_masters_stg[0]:os_masters user: root gather_facts: False diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml index 132c0b05e4..9ff5819e20 100644 --- a/playbooks/openshift-apps/messaging-bridges.yml +++ b/playbooks/openshift-apps/messaging-bridges.yml @@ -76,7 +76,7 @@ # Now create the app - name: make the app be real - hosts: os_masters[0]:os_masters_stg[0]:os-master01.iad2.fedoraproject.org + hosts: os_masters[0]:os_masters_stg[0] user: root gather_facts: False diff --git a/playbooks/openshift-apps/silverblue.yml b/playbooks/openshift-apps/silverblue.yml index 120ec704e3..83ef4e7c73 100644 --- a/playbooks/openshift-apps/silverblue.yml +++ b/playbooks/openshift-apps/silverblue.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters[0]:os_masters_stg[0]:os-master01.iad2.fedoraproject.org + hosts: os_masters[0]:os_masters_stg[0] user: root gather_facts: False diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index b674f27342..42323593a4 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -1,5 +1,5 @@ - name: make the app be real - hosts: os_masters[0]:os_masters_stg[0]:os-master01.iad2.fedoraproject.org + hosts: os_masters[0]:os_masters_stg[0] user: root gather_facts: False