From 4dc8b000aa2a14c8e2568b323fa418db1793a2ba Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 17 Apr 2018 16:00:58 +0200 Subject: [PATCH] Add objectnames everywhere Signed-off-by: Patrick Uiterwijk --- playbooks/openshift-apps/greenwave.yml | 14 +++++++------- playbooks/openshift-apps/librariesio2fedmsg.yml | 8 ++++---- playbooks/openshift-apps/release-monitoring.yml | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index 37c7786728..4855ef9765 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, vars: {app: greenwave, template: imagestream.yml }} - - { role: openshift/object, vars: {app: greenwave, template: buildconfig.yml}, when : env != 'staging' } - - { role: openshift/start-build, vars: {app: greenwave, name: greenwave-docker-build}, when: env != 'staging' } - - { 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/object, vars: {app: greenwave, template: imagestream.yml, objectname: imagestream.yml }} + - { role: openshift/object, vars: {app: greenwave, template: buildconfig.yml, objectname: buildconfig.yml}, when : env != 'staging' } + - { role: openshift/start-build, vars: {app: greenwave, name: greenwave-docker-build, objectname: greenwave-docker-build}, when: env != 'staging' } + - { role: openshift/object, vars: {app: greenwave, template: configmap.yml, objectname: configmap.yml }} + - { role: openshift/object, vars: {app: greenwave, file: service.yml, objectname: service.yml }} + - { role: openshift/object, vars: {app: greenwave, file: route.yml, objectname: route.yml }} + - { role: openshift/object, vars: {app: greenwave, file: deploymentconfig.yml, objectname: deploymentconfig.yml }} - { role: openshift/rollout, vars: {app: greenwave, dcname: greenwave-web }} diff --git a/playbooks/openshift-apps/librariesio2fedmsg.yml b/playbooks/openshift-apps/librariesio2fedmsg.yml index e68d7cf74d..ce6acd9ea8 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, vars: {app: librariesio2fedmsg, file: imagestream.yml }} - - { role: openshift/object, vars: {app: librariesio2fedmsg, file: buildconfig.yml }} + - { role: openshift/object, vars: {app: librariesio2fedmsg, file: imagestream.yml, objectname: imagestream.yml }} + - { role: openshift/object, vars: {app: librariesio2fedmsg, file: buildconfig.yml, objectname: 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/object, vars: {app: librariesio2fedmsg, template: configmap.yml, objectname: configmap.yml }} + - { role: openshift/object, vars: {app: librariesio2fedmsg, file: deploymentconfig.yml, objectname: deploymentconfig.yml }} - { role: openshift/rollout, vars: {app: librariesio2fedmsg, name: librariesio2fedmsg }} diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml index 8ba34dd272..77ef004d4c 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, vars: {app: release-monitoring, file: imagestream.yml }} - - { role: openshift/object, vars: {app: release-monitoring, file: buildconfig.yml }} + - { role: openshift/object, vars: {app: release-monitoring, file: imagestream.yml, objectname: imagestream.yml }} + - { role: openshift/object, vars: {app: release-monitoring, file: buildconfig.yml, objectname: 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/object, vars: {app: release-monitoring, template: configmap.yml, objectname: configmap.yml }} + - { role: openshift/object, vars: {app: release-monitoring, file: service.yml, objectname: service.yml }} + - { role: openshift/object, vars: {app: release-monitoring, file: route.yml, objectname: route.yml }} + - { role: openshift/object, vars: {app: release-monitoring, file: deploymentconfig.yml, objectname: deploymentconfig.yml }} - { role: openshift/rollout, vars: {app: release-monitoring, name: release-monitoring-web }}