coreos-cincinnati: undo some playbook breakage

Conditional build/deploy does not work with current role-based split
(vars cannot be registered after them). Let's undo this for now.

Signed-off-by: Luca Bruno <luca.bruno@coreos.com>
This commit is contained in:
Luca Bruno 2019-06-18 13:09:24 +00:00
parent 8b60731bb2
commit d34b3b8ffa
No known key found for this signature in database
GPG key ID: A9834A2252078E4E

View file

@ -29,24 +29,16 @@
app: coreos-cincinnati app: coreos-cincinnati
template: buildconfig-stub.yml template: buildconfig-stub.yml
objectname: buildconfig-stub.yml objectname: buildconfig-stub.yml
register: coreos_cincinnati_stub_build
- role: openshift/start-build
app: coreos-cincinnati
buildname: coreos-cincinnati-stub
when: coreos_cincinnati_stub_build.changed
- role: openshift/object - role: openshift/object
app: coreos-cincinnati app: coreos-cincinnati
file: config-stub.yml file: config-stub.yml
objectname: config-stub.yml objectname: config-stub.yml
register: coreos_cincinnati_stub_config
- role: openshift/object - role: openshift/object
app: coreos-cincinnati app: coreos-cincinnati
template: deploymentconfig.yml template: deploymentconfig.yml
objectname: deploymentconfig.yml objectname: deploymentconfig.yml
register: coreos_cincinnati_deployment
- role: openshift/object - role: openshift/object
app: coreos-cincinnati app: coreos-cincinnati
@ -63,4 +55,3 @@
- role: openshift/rollout - role: openshift/rollout
app: coreos-cincinnati app: coreos-cincinnati
dcname: coreos-cincinnati-stub dcname: coreos-cincinnati-stub
when: coreos_cincinnati_stub_config.changed or coreos_cincinnati_deployment.changed