summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-07-08 11:43:25 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-07-08 11:43:25 -0300
commit5628e0ce7c86efd47f11310dee204f4a4a8dfc04 (patch)
treea22213bc47640d7db9a14e6f427c781a5e0d2371
parent7480a0e06a9a1da029c6564e1e4d7ef60131e6e2 (diff)
downloadopenshift-5628e0ce7c86efd47f11310dee204f4a4a8dfc04.tar.gz
openshift-5628e0ce7c86efd47f11310dee204f4a4a8dfc04.tar.bz2
openshift-5628e0ce7c86efd47f11310dee204f4a4a8dfc04.tar.xz
openshift-5628e0ce7c86efd47f11310dee204f4a4a8dfc04.zip
Remove all debug used during devel of openshift_version.
-rw-r--r--playbooks/common/openshift-cluster/initialize_openshift_version.yml13
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml2
-rw-r--r--roles/docker/tasks/main.yml5
-rw-r--r--roles/openshift_cli/tasks/main.yml3
-rw-r--r--roles/openshift_version/tasks/main.yml12
-rw-r--r--roles/openshift_version/tasks/set_version_containerized.yml6
-rw-r--r--roles/openshift_version/tasks/set_version_rpm.yml4
7 files changed, 0 insertions, 45 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
index 972df050c..7112a6084 100644
--- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml
+++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
@@ -4,10 +4,6 @@
hosts: oo_first_master
roles:
- openshift_version
- pre_tasks:
- - debug: var=openshift_version
- post_tasks:
- - debug: var=openshift_version
# NOTE: We set this even on etcd hosts as they may also later run as masters,
# and we don't want to install wrong version of docker and have to downgrade
@@ -18,12 +14,3 @@
openshift_version: "{{ hostvars[groups.oo_first_master.0].openshift_version }}"
roles:
- openshift_version
- pre_tasks:
- - debug: var=hostvars[groups.oo_first_master.0].openshift_version
- - debug: var=openshift.common.version
- - debug: var=openshift_version
- post_tasks:
- - debug: var=hostvars[groups.oo_first_master.0].openshift_version
- - debug: var=openshift.common.version
- - debug: var=openshift_version
-
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
index b49b3df7d..7a8dfdf91 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
@@ -173,8 +173,6 @@
register: avail_openshift_version
when: not openshift.common.is_containerized | bool
- - debug: var=avail_openshift_version
-
- name: Verify OpenShift 3.2 RPMs are available for upgrade
fail:
msg: "OpenShift {{ avail_openshift_version.stdout }} is available, but 3.2 or greater is required"
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index a52a28375..aba852e63 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -2,8 +2,6 @@
- stat: path=/etc/sysconfig/docker-storage
register: docker_storage_check
-- debug: var=docker_version
-
- name: Get current installed Docker version
command: "{{ repoquery_cmd }} --installed --qf '%{version}' docker"
when: docker_version is defined and not openshift.common.is_atomic | bool
@@ -92,9 +90,6 @@
- restart docker
when: "{{ 'http_proxy' in openshift.common or 'https_proxy' in openshift.common and docker_check.stat.isreg }}"
-- debug: var=openshift.docker.options
-- debug: var=docker_options
-
- name: Set various Docker options
lineinfile:
dest: /etc/sysconfig/docker
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml
index 097c05483..6b4f16c78 100644
--- a/roles/openshift_cli/tasks/main.yml
+++ b/roles/openshift_cli/tasks/main.yml
@@ -1,7 +1,4 @@
---
-- debug: var=openshift_version
-- debug: var=openshift.common
-
- name: Install clients
action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-clients state=present"
when: not openshift.common.is_containerized | bool
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml
index a27ddeaee..b4f3fb36d 100644
--- a/roles/openshift_version/tasks/main.yml
+++ b/roles/openshift_version/tasks/main.yml
@@ -36,14 +36,6 @@
openshift_version: "{{ openshift.common.version }}"
when: openshift.common.version is defined and openshift_version is not defined and openshift_protect_installed_version | bool
-- debug: var=is_containerized
-- debug: var=openshift_version
-- debug: msg="{{ openshift_version is defined }}"
-- debug: var=openshift_release
-- debug: var=openshift_pkg_version
-- debug: var=openshift_image_tag
-- debug: var=openshift.common.version
-
- name: Set openshift_version for rpm installation
include: set_version_rpm.yml
when: not is_containerized | bool
@@ -65,10 +57,6 @@
openshift_pkg_version: -{{ openshift_version }}
when: openshift_pkg_version is not defined
-- debug: var=openshift_version
-- debug: var=openshift_pkg_version
-- debug: var=openshift_image_tag
-
- fail:
msg: openshift_version role was unable to set openshift_version
when: openshift_version is not defined
diff --git a/roles/openshift_version/tasks/set_version_containerized.yml b/roles/openshift_version/tasks/set_version_containerized.yml
index d822ee164..8e2702391 100644
--- a/roles/openshift_version/tasks/set_version_containerized.yml
+++ b/roles/openshift_version/tasks/set_version_containerized.yml
@@ -16,8 +16,6 @@
register: cli_image_version
when: openshift_version is not defined
-- debug: var=cli_image_version
-
# Origin latest = pre-release version (i.e. v1.3.0-alpha.1-321-gb095e3a)
- set_fact:
openshift_version: "{{ (cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0:2] | join('-'))[1:] }}"
@@ -27,10 +25,6 @@
openshift_version: "{{ cli_image_version.stdout_lines[0].split(' ')[1].split('-')[0][1:] }}"
when: openshift_version is not defined
-- debug: msg="{{ openshift_version }}"
-
-
-
# If we got an openshift_version like "3.2", lookup the latest 3.2 container version
# and use that value instead.
- name: Set precise containerized version to configure if openshift_release specified
diff --git a/roles/openshift_version/tasks/set_version_rpm.yml b/roles/openshift_version/tasks/set_version_rpm.yml
index 889ecc56c..cf0a3b51f 100644
--- a/roles/openshift_version/tasks/set_version_rpm.yml
+++ b/roles/openshift_version/tasks/set_version_rpm.yml
@@ -6,8 +6,6 @@
openshift_version: "{{ openshift_pkg_version[1:].split('-')[0] }}"
when: openshift_pkg_version is defined and openshift_version is not defined
-- debug: var=openshift_version
-
- name: Gather common package version
command: >
{{ repoquery_cmd }} --qf '%{version}' "{{ openshift.common.service_type}}"
@@ -16,8 +14,6 @@
changed_when: false
when: openshift_version is not defined
-- debug: var=common_version
-
- set_fact:
openshift_version: "{{ common_version.stdout | default('0.0', True) }}"
when: openshift_version is not defined