summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml2
-rw-r--r--playbooks/common/openshift-master/config.yml14
2 files changed, 12 insertions, 4 deletions
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 dd9843290..84b7c817b 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
@@ -125,6 +125,8 @@
register: g_rpm_versions_result
when: not openshift.common.is_containerized | bool
+ - debug: var=g_rpm_versions_result
+
- set_fact:
g_aos_versions: "{{ g_rpm_versions_result.stdout | from_yaml }}"
when: not openshift.common.is_containerized | bool
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 97a7db9a1..063d86f60 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -158,7 +158,6 @@
# Must be run before generating master certs which involved openshift_cli role and needs
# to pull down the correct docker container:
-# TODO: Handle rpm installs here
- name: Determine openshift_version to install on first master
hosts: oo_first_master
any_errors_fatal: true
@@ -170,14 +169,21 @@
set_fact:
openshift_version: "{{ openshift_release }}"
when: openshift.common.is_containerized | bool and openshift_release is defined
- - name: Determine version to configure if containerized and image tag specified
+# TODO: what should we do for rpm installs and openshift_release here?
+ - name: Determine container version to configure when openshift_image_tag specified
set_fact:
openshift_version: "{{ openshift_image_tag.split('v',1)[1] }}"
when: openshift.common.is_containerized | bool and openshift_image_tag is defined
- - name: Determine version to configure if already installed
+ - name: Determine rpm version to configure when openshift_pkg_version specified
+ set_fact:
+ # Expects a leading "-" in inventory, strip it off here, and ignore a trailing release,
+ # openshift_version should always just be "3.2" or "3.2.0.44"
+ openshift_version: "{{ openshift_pkg_version[1:].split('-')[0] }}"
+ when: not openshift.common.is_containerized | bool and openshift_pkg_version is defined
+ - name: Use openshift.common.version fact as version to configure if already installed
set_fact:
openshift_version: "{{ openshift.common.version }}"
- when: openshift.common.is_containerized | bool and openshift.common.version is defined
+ when: openshift.common.version is defined
- debug: var=openshift_version
- name: Determine if master certificates need to be generated