diff --git a/playbooks/openshift-apps/asknot.yml b/playbooks/openshift-apps/asknot.yml index fa9536f561..6e37a92348 100644 --- a/playbooks/openshift-apps/asknot.yml +++ b/playbooks/openshift-apps/asknot.yml @@ -59,5 +59,5 @@ object_objectname: deploymentconfig.yml - role: openshift/rollout - app: asknot - dcname: asknot + rollout_app: asknot + rollout_dcname: asknot diff --git a/playbooks/openshift-apps/badges.yml b/playbooks/openshift-apps/badges.yml index 466d7362f3..9fa8a2c5e1 100644 --- a/playbooks/openshift-apps/badges.yml +++ b/playbooks/openshift-apps/badges.yml @@ -205,8 +205,8 @@ - build - role: openshift/rollout - app: badges - dcname: "{{ item }}" + rollout_app: badges + rollout_dcname: "{{ item }}" loop: - fedbadges - tahrir diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index f3bad997ed..a91afd8c91 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -146,14 +146,14 @@ app: bodhi imagename: bodhi-critpathcron - role: openshift/rollout - app: bodhi - dcname: bodhi-web + rollout_app: bodhi + rollout_dcname: bodhi-web - role: openshift/rollout - app: bodhi - dcname: bodhi-consumer + rollout_app: bodhi + rollout_dcname: bodhi-consumer - role: openshift/rollout - app: bodhi - dcname: bodhi-celery + rollout_app: bodhi + rollout_dcname: bodhi-celery post_tasks: - name: Scale up pods diff --git a/playbooks/openshift-apps/compose-tracker.yml b/playbooks/openshift-apps/compose-tracker.yml index a424091ce2..125b62cdc2 100644 --- a/playbooks/openshift-apps/compose-tracker.yml +++ b/playbooks/openshift-apps/compose-tracker.yml @@ -46,8 +46,8 @@ object_objectname: deploymentconfig.yml - role: openshift/rollout - app: compose-tracker - dcname: compose-tracker + rollout_app: compose-tracker + rollout_dcname: compose-tracker ############################################### # actions to delete the project from OpenShift diff --git a/playbooks/openshift-apps/coreos-cincinnati.yml b/playbooks/openshift-apps/coreos-cincinnati.yml index a351c30acc..69069dd728 100644 --- a/playbooks/openshift-apps/coreos-cincinnati.yml +++ b/playbooks/openshift-apps/coreos-cincinnati.yml @@ -55,8 +55,8 @@ object_objectname: deploymentconfig.yml - role: openshift/rollout - app: coreos-cincinnati - dcname: coreos-cincinnati + rollout_app: coreos-cincinnati + rollout_dcname: coreos-cincinnati tags: [never, rollout] - role: openshift/object diff --git a/playbooks/openshift-apps/datagrepper.yml b/playbooks/openshift-apps/datagrepper.yml index ec18c56c1b..16139159a2 100644 --- a/playbooks/openshift-apps/datagrepper.yml +++ b/playbooks/openshift-apps/datagrepper.yml @@ -105,5 +105,5 @@ # buildname: datagrepper # - role: openshift/rollout - # app: datagrepper - # dcname: datagrepper + # rollout_app: datagrepper + # rollout_dcname: datagrepper diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml index 9637c4bc27..49b5940099 100644 --- a/playbooks/openshift-apps/discourse2fedmsg.yml +++ b/playbooks/openshift-apps/discourse2fedmsg.yml @@ -79,5 +79,5 @@ # - build # - role: openshift/rollout - # app: discourse2fedmsg - # dcname: discourse2fedmsg + # rollout_app: discourse2fedmsg + # rollout_dcname: discourse2fedmsg diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml index cc55fa58e4..b183b662cc 100644 --- a/playbooks/openshift-apps/fasjson.yml +++ b/playbooks/openshift-apps/fasjson.yml @@ -115,5 +115,5 @@ # buildname: fasjson # - role: openshift/rollout - # app: noggin - # dcname: noggin + # rollout_app: noggin + # rollout_dcname: noggin diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index ee9e7c3e4d..a846348a60 100644 --- a/playbooks/openshift-apps/greenwave.yml +++ b/playbooks/openshift-apps/greenwave.yml @@ -87,12 +87,12 @@ - apply-deploymentconfig - role: openshift/rollout - app: greenwave - dcname: greenwave-web + rollout_app: greenwave + rollout_dcname: greenwave-web - role: openshift/rollout - app: greenwave - dcname: greenwave-fedmsg-consumers + rollout_app: greenwave + rollout_dcname: greenwave-fedmsg-consumers - name: Change the route haproxy default timeout hosts: os_control[0]:os_control_stg[0] diff --git a/playbooks/openshift-apps/mdapi.yml b/playbooks/openshift-apps/mdapi.yml index 7f78bd1b9c..e937878269 100644 --- a/playbooks/openshift-apps/mdapi.yml +++ b/playbooks/openshift-apps/mdapi.yml @@ -89,5 +89,5 @@ object_objectname: deploymentconfig.yml - role: openshift/rollout - app: mdapi - dcname: mdapi + rollout_app: mdapi + rollout_dcname: mdapi diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml index ec446c23a6..aee3b8ad3f 100644 --- a/playbooks/openshift-apps/messaging-bridges.yml +++ b/playbooks/openshift-apps/messaging-bridges.yml @@ -149,11 +149,11 @@ object_objectname: deploymentconfig.yml - role: openshift/rollout - app: messaging-bridges - dcname: amqp-to-zmq + rollout_app: messaging-bridges + rollout_dcname: amqp-to-zmq - role: openshift/rollout - app: messaging-bridges - dcname: zmq-to-amqp + rollout_app: messaging-bridges + rollout_dcname: zmq-to-amqp - role: openshift/rollout - app: messaging-bridges - dcname: verify-missing + rollout_app: messaging-bridges + rollout_dcname: verify-missing diff --git a/playbooks/openshift-apps/mirrormanager.yml b/playbooks/openshift-apps/mirrormanager.yml index 1da9599632..def2ad495a 100644 --- a/playbooks/openshift-apps/mirrormanager.yml +++ b/playbooks/openshift-apps/mirrormanager.yml @@ -172,8 +172,8 @@ - build - role: openshift/rollout - app: mirrormanager - dcname: frontend + rollout_app: mirrormanager + rollout_dcname: frontend tags: - never - rollout diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml index 417415f86b..fce98744b0 100644 --- a/playbooks/openshift-apps/noggin-centos.yml +++ b/playbooks/openshift-apps/noggin-centos.yml @@ -114,8 +114,8 @@ - build - role: openshift/rollout - app: noggin-centos - dcname: noggin + rollout_app: noggin-centos + rollout_dcname: noggin tags: - never - rollout diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml index d67a87e034..cadf325b36 100644 --- a/playbooks/openshift-apps/noggin.yml +++ b/playbooks/openshift-apps/noggin.yml @@ -109,8 +109,8 @@ - build - role: openshift/rollout - app: noggin - dcname: noggin + rollout_app: noggin + rollout_dcname: noggin tags: - never - rollout diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml index 7caadf6314..17297336cd 100644 --- a/playbooks/openshift-apps/release-monitoring.yml +++ b/playbooks/openshift-apps/release-monitoring.yml @@ -62,5 +62,5 @@ object_file: deploymentconfig.yml object_objectname: deploymentconfig.yml - role: openshift/rollout - app: release-monitoring - dcname: release-monitoring-web + rollout_app: release-monitoring + rollout_dcname: release-monitoring-web diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml index 3a2f7f8c51..9ef5be0ace 100644 --- a/playbooks/openshift-apps/resultsdb.yml +++ b/playbooks/openshift-apps/resultsdb.yml @@ -138,11 +138,11 @@ # rollouts - role: openshift/rollout - app: resultsdb - dcname: "resultsdb-api" + rollout_app: resultsdb + rollout_dcname: "resultsdb-api" failed_when: false - role: openshift/rollout - app: resultsdb - dcname: "resultsdb-frontend" + rollout_app: resultsdb + rollout_dcname: "resultsdb-frontend" failed_when: false diff --git a/playbooks/openshift-apps/the-new-hotness.yml b/playbooks/openshift-apps/the-new-hotness.yml index d9739cc1aa..92bf11ca00 100644 --- a/playbooks/openshift-apps/the-new-hotness.yml +++ b/playbooks/openshift-apps/the-new-hotness.yml @@ -94,5 +94,5 @@ object_objectname: deploymentconfig.yml - role: openshift/rollout - app: the-new-hotness - dcname: the-new-hotness + rollout_app: the-new-hotness + rollout_dcname: the-new-hotness diff --git a/playbooks/openshift-apps/transtats.yml b/playbooks/openshift-apps/transtats.yml index 69124b8d3e..340dbe1a1b 100644 --- a/playbooks/openshift-apps/transtats.yml +++ b/playbooks/openshift-apps/transtats.yml @@ -46,5 +46,5 @@ object_file: deploymentconfig.yml object_objectname: deploymentconfig.yml - role: openshift/rollout - app: transtats - dcname: transtats-web + rollout_app: transtats + rollout_dcname: transtats-web diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index 1ea9d11850..8094aa3519 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -119,5 +119,5 @@ object_objectname: deploymentconfig.yml - role: openshift/rollout - app: waiverdb - dcname: waiverdb-web + rollout_app: waiverdb + rollout_dcname: waiverdb-web diff --git a/playbooks/openshift-apps/webhook2fedmsg.yml b/playbooks/openshift-apps/webhook2fedmsg.yml index 24d1efb05d..ca2082a3e1 100644 --- a/playbooks/openshift-apps/webhook2fedmsg.yml +++ b/playbooks/openshift-apps/webhook2fedmsg.yml @@ -121,5 +121,5 @@ # - build # - role: openshift/rollout - # app: webhook2fedmsg - # dcname: webhook2fedmsg + # rollout_app: webhook2fedmsg + # rollout_dcname: webhook2fedmsg diff --git a/playbooks/openshift-apps/zezere.yml b/playbooks/openshift-apps/zezere.yml index f152fea5b6..f7155354e3 100644 --- a/playbooks/openshift-apps/zezere.yml +++ b/playbooks/openshift-apps/zezere.yml @@ -46,5 +46,5 @@ object_template: deploymentconfig.yml object_objectname: deploymentconfig.yml - role: openshift/rollout - app: zezere - dcname: zezere + rollout_app: zezere + rollout_dcname: zezere diff --git a/roles/openshift/rollout/tasks/main.yml b/roles/openshift/rollout/tasks/main.yml index b417dea964..c2170cf70c 100644 --- a/roles/openshift/rollout/tasks/main.yml +++ b/roles/openshift/rollout/tasks/main.yml @@ -1,3 +1,3 @@ --- - name: Run `oc rollout latest` - shell: oc -n {{app}} rollout latest {{dcname}} + shell: oc -n {{rollout_app}} rollout latest {{rollout_dcname}}