From 066c97690efd915aa3e6977ab85ee83cd9a032a7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 5 Apr 2018 19:58:10 +0000 Subject: [PATCH] tell ansible these are vars --- playbooks/openshift-apps/greenwave.yml | 16 ++++++++-------- .../openshift-apps/librariesio2fedmsg.yml | 12 ++++++------ playbooks/openshift-apps/modernpaste.yml | 18 +++++++++--------- .../openshift-apps/release-monitoring.yml | 16 ++++++++-------- playbooks/openshift-apps/transtats.yml | 16 ++++++++-------- playbooks/openshift-apps/waiverdb.yml | 16 ++++++++-------- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index 2c828d3db0..7539272de7 100644 --- a/playbooks/openshift-apps/greenwave.yml +++ b/playbooks/openshift-apps/greenwave.yml @@ -42,11 +42,11 @@ key: fedmsg-greenwave.crt privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.fedoraproject.org.crt when: env != "staging" - - { role: openshift/object, app: greenwave, file: imagestream.yml } - - { role: openshift/object, app: greenwave, template: buildconfig.yml } - - { role: openshift/start-build, app: greenwave, name: greenwave-docker-build } - - { role: openshift/object, app: greenwave, template: configmap.yml } - - { role: openshift/object, app: greenwave, file: service.yml } - - { role: openshift/object, app: greenwave, file: route.yml } - - { role: openshift/object, app: greenwave, file: deploymentconfig.yml } - - { role: openshift/rollout, app: greenwave, name: greenwave-web } + - { role: openshift/object, vars: {app: greenwave, file: imagestream.yml }} + - { role: openshift/object, vars: {app: greenwave, template: buildconfig.yml }} + - { role: openshift/start-build, vars: {app: greenwave, name: greenwave-docker-build }} + - { role: openshift/object, vars: {app: greenwave, template: configmap.yml }} + - { role: openshift/object, vars: {app: greenwave, file: service.yml }} + - { role: openshift/object, vars: {app: greenwave, file: route.yml }} + - { role: openshift/object, vars: {app: greenwave, file: deploymentconfig.yml }} + - { role: openshift/rollout, vars: {app: greenwave, name: greenwave-web }} diff --git a/playbooks/openshift-apps/librariesio2fedmsg.yml b/playbooks/openshift-apps/librariesio2fedmsg.yml index fedac41ada..667199150f 100644 --- a/playbooks/openshift-apps/librariesio2fedmsg.yml +++ b/playbooks/openshift-apps/librariesio2fedmsg.yml @@ -24,9 +24,9 @@ secret_name: librariesio2fedmsg-fedmsg-crt key: fedmsg-librariesio2fedmsg.crt privatefile: fedmsg-certs/keys/librariesio2fedmsg-librariesio2fedmsg.app.os.fedoraproject.org.crt - - { role: openshift/object, app: librariesio2fedmsg, file: imagestream.yml } - - { role: openshift/object, app: librariesio2fedmsg, file: buildconfig.yml } - - { role: openshift/start-build, app: librariesio2fedmsg, name: sse2fedmsg-docker-build } - - { role: openshift/object, app: librariesio2fedmsg, template: configmap.yml } - - { role: openshift/object, app: librariesio2fedmsg, file: deploymentconfig.yml } - - { role: openshift/rollout, app: librariesio2fedmsg, name: librariesio2fedmsg } + - { role: openshift/object, vars: {app: librariesio2fedmsg, file: imagestream.yml }} + - { role: openshift/object, vars: {app: librariesio2fedmsg, file: buildconfig.yml }} + - { role: openshift/start-build, vars: {app: librariesio2fedmsg, name: sse2fedmsg-docker-build }} + - { role: openshift/object, vars: {app: librariesio2fedmsg, template: configmap.yml }} + - { role: openshift/object, vars: {app: librariesio2fedmsg, file: deploymentconfig.yml }} + - { role: openshift/rollout, vars: {app: librariesio2fedmsg, name: librariesio2fedmsg }} diff --git a/playbooks/openshift-apps/modernpaste.yml b/playbooks/openshift-apps/modernpaste.yml index 260281eb2a..69d46755ae 100644 --- a/playbooks/openshift-apps/modernpaste.yml +++ b/playbooks/openshift-apps/modernpaste.yml @@ -14,12 +14,12 @@ description: modernpaste appowners: - codeblock - - { role: openshift/object, app: modernpaste, file: imagestream.yml } - - { role: openshift/object, app: modernpaste, template: secret.yml } - - { role: openshift/object, app: modernpaste, file: buildconfig.yml } - - { role: openshift/start-build, app: modernpaste, name: modernpaste-docker-build } - - { role: openshift/object, app: modernpaste, template: configmap.yml } - - { role: openshift/object, app: modernpaste, file: service.yml } - - { role: openshift/object, app: modernpaste, file: route.yml } - - { role: openshift/object, app: modernpaste, file: deploymentconfig.yml } - - { role: openshift/rollout, app: modernpaste, name: modernpaste-web } + - { role: openshift/object, vars: {app: modernpaste, file: imagestream.yml }} + - { role: openshift/object, vars: {app: modernpaste, template: secret.yml }} + - { role: openshift/object, vars: {app: modernpaste, file: buildconfig.yml }} + - { role: openshift/start-build, vars: {app: modernpaste, name: modernpaste-docker-build }} + - { role: openshift/object, vars: {app: modernpaste, template: configmap.yml }} + - { role: openshift/object, vars: {app: modernpaste, file: service.yml }} + - { role: openshift/object, vars: {app: modernpaste, file: route.yml }} + - { role: openshift/object, vars: {app: modernpaste, file: deploymentconfig.yml }} + - { role: openshift/rollout, vars: {app: modernpaste, name: modernpaste-web }} diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml index 7f4e866352..c7d591792a 100644 --- a/playbooks/openshift-apps/release-monitoring.yml +++ b/playbooks/openshift-apps/release-monitoring.yml @@ -14,11 +14,11 @@ description: release-monitoring appowners: - jcline - - { role: openshift/object, app: release-monitoring, file: imagestream.yml } - - { role: openshift/object, app: release-monitoring, file: buildconfig.yml } - - { role: openshift/start-build, app: release-monitoring, name: release-monitoring-web-build } - - { role: openshift/object, app: release-monitoring, template: configmap.yml } - - { role: openshift/object, app: release-monitoring, file: service.yml } - - { role: openshift/object, app: release-monitoring, file: route.yml } - - { role: openshift/object, app: release-monitoring, file: deploymentconfig.yml } - - { role: openshift/rollout, app: release-monitoring, name: release-monitoring-web } + - { role: openshift/object, vars: {app: release-monitoring, file: imagestream.yml }} + - { role: openshift/object, vars: {app: release-monitoring, file: buildconfig.yml }} + - { role: openshift/start-build, vars: {app: release-monitoring, name: release-monitoring-web-build }} + - { role: openshift/object, vars: {app: release-monitoring, template: configmap.yml }} + - { role: openshift/object, vars: {app: release-monitoring, file: service.yml }} + - { role: openshift/object, vars: {app: release-monitoring, file: route.yml }} + - { role: openshift/object, vars: {app: release-monitoring, file: deploymentconfig.yml }} + - { role: openshift/rollout, vars: {app: release-monitoring, name: release-monitoring-web }} diff --git a/playbooks/openshift-apps/transtats.yml b/playbooks/openshift-apps/transtats.yml index 237ca2839a..f18bc14384 100644 --- a/playbooks/openshift-apps/transtats.yml +++ b/playbooks/openshift-apps/transtats.yml @@ -14,11 +14,11 @@ description: transtats appowners: - suanand - - { role: openshift/object, app: transtats, template: secret.yml } - - { role: openshift/object, app: transtats, file: imagestream.yml } - - { role: openshift/object, app: transtats, file: buildconfig.yml } - - { role: openshift/start-build, app: transtats, name: transtats-build } - - { role: openshift/object, app: transtats, file: service.yml } - - { role: openshift/object, app: transtats, file: route.yml } - - { role: openshift/object, app: transtats, file: deploymentconfig.yml } - - { role: openshift/rollout, app: transtats, name: transtats-web } + - { role: openshift/object, vars: {app: transtats, template: secret.yml }} + - { role: openshift/object, vars: {app: transtats, file: imagestream.yml }} + - { role: openshift/object, vars: {app: transtats, file: buildconfig.yml }} + - { role: openshift/start-build, vars: {app: transtats, name: transtats-build }} + - { role: openshift/object, vars: {app: transtats, file: service.yml }} + - { role: openshift/object, vars: {app: transtats, file: route.yml }} + - { role: openshift/object, vars: {app: transtats, file: deploymentconfig.yml }} + - { role: openshift/rollout, vars: {app: transtats, name: transtats-web }} diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index cc8ff823f5..2f7af5f085 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -49,11 +49,11 @@ key: fedmsg-waiverdb.crt privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.crt when: env != "staging" - - { role: openshift/object, app: waiverdb, file: imagestream.yml } - - { role: openshift/object, app: waiverdb, file: buildconfig.yml } - - { role: openshift/start-build, app: waiverdb, name: waiverdb-docker-build } - - { role: openshift/object, app: waiverdb, template: configmap.yml } - - { role: openshift/object, app: waiverdb, file: service.yml } - - { role: openshift/object, app: waiverdb, file: route.yml } - - { role: openshift/object, app: waiverdb, template: deploymentconfig.yml } - - { role: openshift/rollout, app: waiverdb, name: waiverdb-web } + - { role: openshift/object, vars: {app: waiverdb, file: imagestream.yml }} + - { role: openshift/object, vars: {app: waiverdb, file: buildconfig.yml }} + - { role: openshift/start-build, vars: {app: waiverdb, name: waiverdb-docker-build }} + - { role: openshift/object, vars: {app: waiverdb, template: configmap.yml }} + - { role: openshift/object, vars: {app: waiverdb, file: service.yml }} + - { role: openshift/object, vars: {app: waiverdb, file: route.yml }} + - { role: openshift/object, vars: {app: waiverdb, template: deploymentconfig.yml }} + - { role: openshift/rollout, vars: {app: waiverdb, name: waiverdb-web }}