Fix missing etcd_data_dir bug.

A late change to original PR was not properly tested, there is a problem in the
facts when upgrading where the deployment type is openshift-enterprise, and the
system facts start reporting data_dir and config_base as referencing origin
directories, which are not yet symlinked to their previous openshift variants.

To correct we watch for a scenario where we evaluate these to origin
directories, which don't exist, but the openshift ones do. (to allow for
installation to still point at the origin variety)

roles/openshift_facts/library/openshift_facts.py

@@ -604,11 +604,17 @@ def set_deployment_facts_if_unset(facts):
             config_base = '/etc/origin'
             if deployment_type in ['enterprise', 'online']:
                 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'):
+                config_base = '/etc/openshift'
             facts['common']['config_base'] = config_base
         if 'data_dir' not in facts['common']:
             data_dir = '/var/lib/origin'
             if deployment_type in ['enterprise', 'online']:
                 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'):
+                data_dir = '/var/lib/openshift'
             facts['common']['data_dir'] = data_dir
 
     for role in ('master', 'node'):