atomic-openshift-installer: Better specification of ansible connection point

Changes to installer.cfg.yaml to allow for better defaults in unattended mode.
Update example in the docs.

1 files changed, 9 insertions, 13 deletions

diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py
index 4281947f1..f35a8f51b 100644
--- a/utils/src/ooinstall/oo_config.py
+++ b/utils/src/ooinstall/oo_config.py
@@ -35,6 +35,7 @@ class Host(object):
         self.hostname = kwargs.get('hostname', None)
         self.public_ip = kwargs.get('public_ip', None)
         self.public_hostname = kwargs.get('public_hostname', None)
+        self.connect_to = kwargs.get('connect_to', None)
 
         # Should this host run as an OpenShift master:
         self.master = kwargs.get('master', False)
@@ -43,30 +44,25 @@ class Host(object):
         self.node = kwargs.get('node', False)
         self.containerized = kwargs.get('containerized', False)
 
-        if self.ip is None and self.hostname is None:
-            raise OOConfigInvalidHostError("You must specify either 'ip' or 'hostname'")
+        if self.connect_to is None:
+            raise OOConfigInvalidHostError("You must specify either and 'ip' " \
+                                           "or 'hostname' to connect to.")
 
         if self.master is False and self.node is False:
             raise OOConfigInvalidHostError(
                 "You must specify each host as either a master or a node.")
 
-        # Hosts can be specified with an ip, hostname, or both. However we need
-        # something authoritative we can connect to and refer to the host by.
-        # Preference given to the IP if specified as this is more specific.
-        # We know one must be set by this point.
-        self.name = self.ip if self.ip is not None else self.hostname
-
     def __str__(self):
-        return self.name
+        return self.connect_to
 
     def __repr__(self):
-        return self.name
+        return self.connect_to
 
     def to_dict(self):
         """ Used when exporting to yaml. """
         d = {}
         for prop in ['ip', 'hostname', 'public_ip', 'public_hostname',
-                     'master', 'node', 'containerized']:
+                     'master', 'node', 'containerized', 'connect_to']:
             # If the property is defined (not None or False), export it:
             if getattr(self, prop):
                 d[prop] = getattr(self, prop)
@@ -182,7 +178,7 @@ class OOConfig(object):
                 if not getattr(host, required_fact):
                     missing_facts.append(required_fact)
             if len(missing_facts) > 0:
-                result[host.name] = missing_facts
+                result[host.connect_to] = missing_facts
         return result
 
     def save_to_disk(self):
@@ -214,6 +210,6 @@ class OOConfig(object):
 
     def get_host(self, name):
         for host in self.hosts:
-            if host.name == name:
+            if host.connect_to == name:
                 return host
         return None