summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-05-20 15:52:54 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-05-25 10:28:32 -0300
commit82a70f9cc1522d239212701ab6c9260cbf9dc8a7 (patch)
tree15daeb8ba45c84e15df734f201ee85d9e4f5ca9a /roles
parentc45562e0e03e03c82bfcf60d4b3f8b7793133301 (diff)
downloadopenshift-82a70f9cc1522d239212701ab6c9260cbf9dc8a7.tar.gz
openshift-82a70f9cc1522d239212701ab6c9260cbf9dc8a7.tar.bz2
openshift-82a70f9cc1522d239212701ab6c9260cbf9dc8a7.tar.xz
openshift-82a70f9cc1522d239212701ab6c9260cbf9dc8a7.zip
Remove now unnecessary pull and ver check in openshift_docker role.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_docker/tasks/main.yml36
1 files changed, 0 insertions, 36 deletions
diff --git a/roles/openshift_docker/tasks/main.yml b/roles/openshift_docker/tasks/main.yml
index 79efb193b..aaa472727 100644
--- a/roles/openshift_docker/tasks/main.yml
+++ b/roles/openshift_docker/tasks/main.yml
@@ -8,39 +8,3 @@
# in non-upgrade scenarios:
has_image_tag_fact: "{{ hostvars[inventory_hostname].openshift.docker.openshift_image_tag is defined }}"
-- debug: var=openshift_image_tag
-- debug: var=openshift_release
-
-- name: Set version when containerized
- command: >
- docker run --rm {{ openshift.common.cli_image }} version
- register: cli_image_version
- when: is_containerized | bool and openshift_image_tag is not defined and (upgrading | bool or not has_image_tag_fact | bool)
-
-- debug: var=cli_image_version
-
-# Use the pre-existing image tag from system facts if present, and we're not upgrading.
-# Ignores explicit openshift_image_tag if it's in the inventory, as this isn't an upgrade.
-- set_fact:
- l_image_tag: "{{ hostvars[inventory_hostname].openshift.docker.openshift_image_tag }}"
- when: is_containerized | bool and not upgrading | bool and has_image_tag_fact | bool
-
-- set_fact:
- l_image_tag: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0:2] | join('-') if openshift.common.deployment_type == 'origin' else
- cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0] }}"
- when: is_containerized | bool and openshift_image_tag is not defined and (upgrading | bool or not has_image_tag_fact | bool)
-
-- set_fact:
- l_image_tag: "{{ openshift_image_tag }}"
- when: is_containerized | bool and openshift_image_tag is defined and (upgrading | bool or not has_image_tag_fact | bool)
-
-- name: Set post docker install facts
- openshift_facts:
- role: "{{ item.role }}"
- local_facts: "{{ item.local_facts }}"
- with_items:
- - role: docker
- local_facts:
- openshift_image_tag: "{{ l_image_tag | default(None) }}"
- openshift_version: "{{ l_image_tag.split('-')[0] | oo_image_tag_to_rpm_version if l_image_tag is defined else '' }}"
- when: is_containerized | bool