浏览代码

No longer worry about openshift_version

Jeremiah Stuever 6 年之前
父节点
当前提交
15e630ef58
共有 2 个文件被更改,包括 0 次插入50 次删除
  1. 0 2
      playbooks/init/main.yml
  2. 0 48
      playbooks/init/version.yml

+ 0 - 2
playbooks/init/main.yml

@@ -9,5 +9,3 @@
 # base_packages needs to be setup for openshift_facts.py to run correctly.
 - import_playbook: base_packages.yml
   when: l_install_base_packages | default(False) | bool
-
-- import_playbook: version.yml

+ 0 - 48
playbooks/init/version.yml

@@ -1,48 +0,0 @@
----
-- name: Determine openshift_version to configure
-  hosts: oo_nodes_to_config
-  tasks:
-  - name: Set openshift_version to openshift_release if undefined
-    set_fact:
-      openshift_version: "4.0"
-    when:
-    - openshift_version is not defined or openshift_version == ""
-
-  - block:
-    - debug:
-        msg: "openshift_pkg_version was not defined. Falling back to -{{ openshift_version }}"
-    - set_fact:
-        # We append an '*' here because yum is not flexible.
-        openshift_pkg_version: "-{{ openshift_version }}*"
-    when:
-    - openshift_pkg_version is not defined
-
-  - block:
-    - debug:
-        msg: "openshift_image_tag was not defined. Falling back to v{{ openshift_version }}"
-    - set_fact:
-        openshift_image_tag: "v{{ openshift_version }}"
-    when: openshift_image_tag is not defined
-
-  - name: assert openshift_release in openshift_image_tag
-    assert:
-      that: openshift_release in openshift_image_tag
-      msg: >
-        openshift_image_tag must match same major version as openshift_release.
-        You provided: {{ openshift_release }} and {{ openshift_image_tag }}
-
-  - name: assert openshift_release in openshift_pkg_version
-    assert:
-      that: openshift_release in openshift_pkg_version
-      msg: >
-        openshift_pkg_version must match same major version as openshift_release.
-        You provided: {{ openshift_release }} and {{ openshift_pkg_version }}
-
-  # The end result of these variables is quite important so make sure they are displayed and logged:
-  - debug: var=openshift_release
-
-  - debug: var=openshift_image_tag
-
-  - debug: var=openshift_pkg_version
-
-  - debug: var=openshift_version