|
@@ -18,7 +18,6 @@ def set_config(cfg):
|
|
|
def generate_inventory(hosts):
|
|
|
global CFG
|
|
|
|
|
|
- installer_host = socket.gethostname()
|
|
|
base_inventory_path = CFG.settings['ansible_inventory_path']
|
|
|
base_inventory = open(base_inventory_path, 'w')
|
|
|
base_inventory.write('\n[OSEv3:children]\nmasters\nnodes\n')
|
|
@@ -44,14 +43,6 @@ def generate_inventory(hosts):
|
|
|
if 'OO_INSTALL_STAGE_REGISTRY' in os.environ:
|
|
|
base_inventory.write('oreg_url=registry.access.stage.redhat.com/openshift3/ose-${component}:${version}\n')
|
|
|
|
|
|
- if any(host.hostname == installer_host or host.public_hostname == installer_host
|
|
|
- for host in hosts):
|
|
|
- no_pwd_sudo = subprocess.call(['sudo', '-v', '-n'])
|
|
|
- if no_pwd_sudo == 1:
|
|
|
- print 'The atomic-openshift-installer requires sudo access without a password.'
|
|
|
- sys.exit(1)
|
|
|
- base_inventory.write("ansible_connection=local\n")
|
|
|
-
|
|
|
base_inventory.write('\n[masters]\n')
|
|
|
masters = (host for host in hosts if host.master)
|
|
|
for master in masters:
|
|
@@ -72,6 +63,7 @@ def generate_inventory(hosts):
|
|
|
|
|
|
def write_host(host, inventory, scheduleable=True):
|
|
|
global CFG
|
|
|
+
|
|
|
facts = ''
|
|
|
if host.ip:
|
|
|
facts += ' openshift_ip={}'.format(host.ip)
|
|
@@ -85,6 +77,16 @@ def write_host(host, inventory, scheduleable=True):
|
|
|
# Technically only nodes will ever need this.
|
|
|
if not scheduleable:
|
|
|
facts += ' openshift_scheduleable=False'
|
|
|
+ installer_host = socket.gethostname()
|
|
|
+ if host.hostname == installer_host or host.public_hostname == installer_host:
|
|
|
+ facts += ' ansible_connection=local'
|
|
|
+ if os.geteuid() != 0:
|
|
|
+ no_pwd_sudo = subprocess.call(['sudo', '-v', '-n'])
|
|
|
+ if no_pwd_sudo == 1:
|
|
|
+ print 'The atomic-openshift-installer requires sudo access without a password.'
|
|
|
+ sys.exit(1)
|
|
|
+ facts += ' ansible_become=true'
|
|
|
+
|
|
|
inventory.write('{} {}\n'.format(host, facts))
|
|
|
|
|
|
|