Переглянути джерело

Merge pull request #555 from umairmufti/issue-554

Fix to ensure use_openshift_sdn is a boolean value.
Wesley Hearn 9 роки тому
батько
коміт
0588094f46
1 змінених файлів з 4 додано та 1 видалено
  1. 4 1
      roles/openshift_facts/library/openshift_facts.py

+ 4 - 1
roles/openshift_facts/library/openshift_facts.py

@@ -16,6 +16,7 @@ EXAMPLES = '''
 import ConfigParser
 import ConfigParser
 import copy
 import copy
 import os
 import os
+from distutils.util import strtobool
 
 
 
 
 def hostname_valid(hostname):
 def hostname_valid(hostname):
@@ -494,8 +495,10 @@ def set_sdn_facts_if_unset(facts):
                   were not already present
                   were not already present
     """
     """
     if 'common' in facts:
     if 'common' in facts:
+        use_sdn = facts['common']['use_openshift_sdn']
+        if not (use_sdn == '' or isinstance(use_sdn, bool)):
+            facts['common']['use_openshift_sdn'] = bool(strtobool(str(use_sdn)))
         if 'sdn_network_plugin_name' not in facts['common']:
         if 'sdn_network_plugin_name' not in facts['common']:
-            use_sdn = facts['common']['use_openshift_sdn']
             plugin = 'redhat/openshift-ovs-subnet' if use_sdn else ''
             plugin = 'redhat/openshift-ovs-subnet' if use_sdn else ''
             facts['common']['sdn_network_plugin_name'] = plugin
             facts['common']['sdn_network_plugin_name'] = plugin