Browse Source

Merge pull request #1127 from wshearn/update_config_base_online

Update openshift_facts config_base for Online deployments
Wesley Hearn 9 years ago
parent
commit
2d13cea12a
1 changed files with 2 additions and 2 deletions
  1. 2 2
      roles/openshift_facts/library/openshift_facts.py

+ 2 - 2
roles/openshift_facts/library/openshift_facts.py

@@ -628,7 +628,7 @@ def set_deployment_facts_if_unset(facts):
             facts['common']['service_type'] = service_type
         if 'config_base' not in facts['common']:
             config_base = '/etc/origin'
-            if deployment_type in ['enterprise', 'online']:
+            if deployment_type in ['enterprise']:
                 config_base = '/etc/openshift'
             # Handle upgrade scenarios when symlinks don't yet exist:
             if not os.path.exists(config_base) and os.path.exists('/etc/openshift'):
@@ -636,7 +636,7 @@ def set_deployment_facts_if_unset(facts):
             facts['common']['config_base'] = config_base
         if 'data_dir' not in facts['common']:
             data_dir = '/var/lib/origin'
-            if deployment_type in ['enterprise', 'online']:
+            if deployment_type in ['enterprise']:
                 data_dir = '/var/lib/openshift'
             # Handle upgrade scenarios when symlinks don't yet exist:
             if not os.path.exists(data_dir) and os.path.exists('/var/lib/openshift'):