From 47a1cb4d76fe408043ef55f28bb87f1cefdf3903 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Sat, 25 Jun 2016 18:34:21 +0000 Subject: [PATCH] register origin_verison as an ansible fact for osbs Signed-off-by: Adam Miller --- playbooks/groups/osbs-master.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml index 1bf69b8725..eb381edee3 100644 --- a/playbooks/groups/osbs-master.yml +++ b/playbooks/groups/osbs-master.yml @@ -193,9 +193,13 @@ tasks: - - name: register origin_version + - name: register origin_version_out rpm query shell: "rpm -q origin --qf '%{Version}'" - register: origin_version + register: origin_version_out + + - set_fact: + origin_version: "{{origin_version_out.stdout}}" + - name: pre-stage content in our docker registry hosts: compose-x86-01.phx2.fedoraproject.org @@ -206,15 +210,15 @@ tasks: - name: pull openshift required docker images - shell: "docker pull {{item}}:v{{origin_version.stdout}}" + shell: "docker pull {{item}}:v{{origin_version}}" with_items: "{{openshift_required_images}}" - name: tag openshift required docker images for our registry - shell: "docker tag {{item}}:v{{origin_version.stdout}} {{docker_registry}}/{{item}}:v{{origin_version.stdout}}" + shell: "docker tag {{item}}:v{{origin_version}} {{docker_registry}}/{{item}}:v{{origin_version}}" with_items: "{{openshift_required_images}}" - name: push openshift required docker images to our registry - shell: "docker push {{docker_registry}}/{{item}}:v{{origin_version.stdout}}" + shell: "docker push {{docker_registry}}/{{item}}:v{{origin_version}}" with_items: "{{openshift_required_images}}" - name: post-install osbs tasks @@ -308,11 +312,11 @@ state: hard - name: pull openshift required docker images - shell: "docker pull {{docker_registry}}/{{item}}:v{{origin_version.stdout}}" + shell: "docker pull {{docker_registry}}/{{item}}:v{{origin_version}}" with_items: "{{openshift_required_images}}" - name: tag openshift required docker images locally - shell: "docker tag {{docker_registry}}/{{item}}:v{{origin_version.stdout}} {{item}}:v{{origin_version.stdout}}" + shell: "docker tag {{docker_registry}}/{{item}}:v{{origin_version}} {{item}}:v{{origin_version}}" with_items: "{{openshift_required_images}}" - name: refresh fedora image streams