summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-07-11 10:08:14 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-07-11 10:23:23 -0300
commit02d4470e1ff26350a2e02567246627aaf09455eb (patch)
tree0db15465c560ad1d94685a7ffccfceaf5ec9172e
parent2a8b144073f474bf966c6ab92329442a1a526bde (diff)
downloadopenshift-02d4470e1ff26350a2e02567246627aaf09455eb.tar.gz
openshift-02d4470e1ff26350a2e02567246627aaf09455eb.tar.bz2
openshift-02d4470e1ff26350a2e02567246627aaf09455eb.tar.xz
openshift-02d4470e1ff26350a2e02567246627aaf09455eb.zip
Use proper startswith.
-rw-r--r--filter_plugins/oo_filters.py5
-rw-r--r--roles/openshift_version/tasks/main.yml2
2 files changed, 1 insertions, 6 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py
index 54891b066..7510975f2 100644
--- a/filter_plugins/oo_filters.py
+++ b/filter_plugins/oo_filters.py
@@ -891,10 +891,6 @@ class FilterModule(object):
return version
- @staticmethod
- def oo_startswith(input, prefix):
- return input.startswith(prefix)
-
def filters(self):
""" returns a mapping of filters to methods """
return {
@@ -928,5 +924,4 @@ class FilterModule(object):
"oo_oc_nodes_matching_selector": self.oo_oc_nodes_matching_selector,
"oo_oc_nodes_with_label": self.oo_oc_nodes_with_label,
"oo_merge_hostvars": self.oo_merge_hostvars,
- "oo_startswith": self.oo_startswith,
}
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml
index b4f3fb36d..2d96d2765 100644
--- a/roles/openshift_version/tasks/main.yml
+++ b/roles/openshift_version/tasks/main.yml
@@ -73,4 +73,4 @@
# the rpm version we looked up matches the release requested and error out if not.
- fail:
msg: "Detected openshift version {{ openshift_version }} does not match requested openshift_release {{ openshift_release }}. You may need to adjust your yum repositories or specify an exact openshift_pkg_version."
- when: not is_containerized | bool and openshift_release is defined and not openshift_version | oo_startswith(openshift_release) | bool
+ when: not is_containerized | bool and openshift_release is defined and not openshift_version.startswith(openshift_release) | bool