Remove version_gte_3_10, version_gte_3_11, content_version

These are relics of old patterns where we tried to maintain support with
multiple versions of Origin in one release of openshift-ansible. We no
longer do that so simplify all content management

playbooks/init/version.yml

@@ -6,12 +6,6 @@
       name: openshift_version
       tasks_from: first_master.yml
 
-  # set_version_facts is a custom module in lib_utils
-  # this will set_fact booleans for openshift_verison
-  - name: set openshift_version booleans (first master)
-    set_version_facts:
-      version: "{{ openshift_current_version | default(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
 # later.
@@ -27,9 +21,3 @@
       openshift_version: "{{ l_first_master_openshift_version }}"
       openshift_pkg_version: "{{ l_first_master_openshift_pkg_version }}"
       openshift_image_tag: "{{ l_first_master_openshift_image_tag }}"
-
-  # set_version_facts is a custom module in lib_utils
-  # this will set_fact booleans for openshift_verison
-  - name: set openshift_version booleans (masters and nodes)
-    set_version_facts:
-      version: "{{ openshift_current_version | default(openshift_version) }}"

roles/lib_utils/action_plugins/set_version_facts.py

@@ -1,59 +0,0 @@
-"""
-Ansible action plugin to set version facts
-"""
-
-# pylint: disable=no-name-in-module, import-error, wrong-import-order
-from distutils.version import LooseVersion
-from ansible.plugins.action import ActionBase
-
-
-# pylint: disable=too-many-statements
-def set_version_facts_if_unset(version):
-    """ Set version facts. This currently includes common.version and
-        common.version_gte_3_x
-
-        Args:
-            version (string): version of openshift installed/to install
-        Returns:
-            dict: the facts dict updated with version facts.
-    """
-    facts = {}
-    if version and version != "latest":
-        version = LooseVersion(version)
-        version_gte_3_10 = version >= LooseVersion('3.10')
-        version_gte_3_11 = version >= LooseVersion('3.11')
-    else:
-        # 'Latest' version is set to True, 'Next' versions set to False
-        version_gte_3_10 = True
-        version_gte_3_11 = False
-    facts['openshift_version_gte_3_10'] = version_gte_3_10
-    facts['openshift_version_gte_3_11'] = version_gte_3_11
-
-    if version_gte_3_11:
-        examples_content_version = 'v3.11'
-    else:
-        examples_content_version = 'v3.10'
-
-    facts['openshift_examples_content_version'] = examples_content_version
-
-    return facts
-
-
-# pylint: disable=too-few-public-methods
-class ActionModule(ActionBase):
-    """Action plugin to set version facts"""
-
-    def run(self, tmp=None, task_vars=None):
-        """Run set_version_facts"""
-        result = super(ActionModule, self).run(tmp, task_vars)
-        # Ignore settting self.task_vars outside of init.
-        # pylint: disable=W0201
-        self.task_vars = task_vars or {}
-
-        result["changed"] = False
-        result["failed"] = False
-        result["msg"] = "Version facts set"
-
-        version = self._task.args.get('version')
-        result["ansible_facts"] = set_version_facts_if_unset(version)
-        return result

roles/openshift_examples/defaults/main.yml

@@ -6,8 +6,6 @@ openshift_examples_load_db_templates: true
 openshift_examples_load_xpaas: "{{ openshift_deployment_type != 'origin' }}"
 openshift_examples_load_quickstarts: true
 
-content_version: "{{ openshift_examples_content_version }}"
-
 examples_base: "{{ openshift.common.config_base if openshift_is_containerized | bool else '/usr/share/openshift' }}/examples"
 image_streams_base: "{{ examples_base }}/image-streams"
 centos_image_streams:

roles/openshift_examples/examples-sync.sh

@@ -12,7 +12,7 @@ DG_72_VERSION=datagrid72-dev
 ORIGIN_VERSION=${1:-v3.11}
 ORIGIN_BRANCH=${2:-master}
 RHAMP_TAG=2.0.0.GA
-EXAMPLES_BASE=$(pwd)/files/examples/${ORIGIN_VERSION}
+EXAMPLES_BASE=$(pwd)/files/examples/latest
 find ${EXAMPLES_BASE} -name '*.json' -delete
 TEMP=`mktemp -d`
 pushd $TEMP