openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Only use rpm installed collections/modules"

This commit is contained in:
Zuul 2022-10-17 08:32:24 +00:00 committed by Gerrit Code Review
parent 66156f7395 8129d94a5d
commit fd886afbe6
1 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tripleoclient/utils.py
View File

@ -445,7 +445,6 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
limit_hosts limit_hosts
) )
) )
cwd = os.getcwd()
ansible_fact_path = os.path.join( ansible_fact_path = os.path.join(
os.path.expanduser('~'), os.path.expanduser('~'),
'.tripleo', '.tripleo',
@ -484,83 +483,52 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
env['ANSIBLE_SCP_IF_SSH'] = True env['ANSIBLE_SCP_IF_SSH'] = True
env['ANSIBLE_REMOTE_USER'] = ssh_user env['ANSIBLE_REMOTE_USER'] = ssh_user
env['ANSIBLE_STDOUT_CALLBACK'] = output_callback env['ANSIBLE_STDOUT_CALLBACK'] = output_callback
env['ANSIBLE_LIBRARY'] = os.path.expanduser( env['ANSIBLE_COLLECTIONS_PATHS'] = '/usr/share/ansible/collections'
'{}/.ansible/plugins/modules:' env['ANSIBLE_LIBRARY'] = (
'{}:{}:'
'/usr/share/ansible/tripleo-plugins/modules:' '/usr/share/ansible/tripleo-plugins/modules:'
'/usr/share/ansible/plugins/modules:' '/usr/share/ansible/plugins/modules:'
'/usr/share/ceph-ansible/library:' '/usr/share/ceph-ansible/library:'
'/usr/share/ansible-modules:' '/usr/share/ansible-modules:'
'{}/library'.format( '{}/library'.format(constants.DEFAULT_VALIDATIONS_BASEDIR)
constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'modules'),
os.path.join(cwd, 'modules'),
constants.DEFAULT_VALIDATIONS_BASEDIR
)
) )
env['ANSIBLE_LOOKUP_PLUGINS'] = os.path.expanduser( env['ANSIBLE_LOOKUP_PLUGINS'] = (
'{}/.ansible/plugins/lookup:'
'{}:{}:'
'/usr/share/ansible/tripleo-plugins/lookup:' '/usr/share/ansible/tripleo-plugins/lookup:'
'/usr/share/ansible/plugins/lookup:' '/usr/share/ansible/plugins/lookup:'
'/usr/share/ceph-ansible/plugins/lookup:' '/usr/share/ceph-ansible/plugins/lookup:'
'{}/lookup_plugins'.format( '{}/lookup_plugins'.format(
constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'lookup'),
os.path.join(cwd, 'lookup'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR
) )
) )
env['ANSIBLE_CALLBACK_PLUGINS'] = os.path.expanduser( env['ANSIBLE_CALLBACK_PLUGINS'] = (
'{}/.ansible/plugins/callback:'
'{}:{}:'
'/usr/share/ansible/tripleo-plugins/callback:' '/usr/share/ansible/tripleo-plugins/callback:'
'/usr/share/ansible/plugins/callback:' '/usr/share/ansible/plugins/callback:'
'/usr/share/ceph-ansible/plugins/callback:' '/usr/share/ceph-ansible/plugins/callback:'
'{}/callback_plugins'.format( '{}/callback_plugins'.format(
constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'callback'),
os.path.join(cwd, 'callback'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR
) )
) )
env['ANSIBLE_ACTION_PLUGINS'] = os.path.expanduser( env['ANSIBLE_ACTION_PLUGINS'] = (
'{}/.ansible/plugins/action:'
'{}:{}:'
'/usr/share/ansible/tripleo-plugins/action:' '/usr/share/ansible/tripleo-plugins/action:'
'/usr/share/ansible/plugins/action:' '/usr/share/ansible/plugins/action:'
'/usr/share/ceph-ansible/plugins/actions:' '/usr/share/ceph-ansible/plugins/actions:'
'{}/action_plugins'.format( '{}/action_plugins'.format(
constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'action'),
os.path.join(cwd, 'action'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR
) )
) )
env['ANSIBLE_FILTER_PLUGINS'] = os.path.expanduser( env['ANSIBLE_FILTER_PLUGINS'] = (
'{}/.ansible/plugins/filter:'
'{}:{}:'
'/usr/share/ansible/tripleo-plugins/filter:' '/usr/share/ansible/tripleo-plugins/filter:'
'/usr/share/ansible/plugins/filter:' '/usr/share/ansible/plugins/filter:'
'/usr/share/ceph-ansible/plugins/filter:' '/usr/share/ceph-ansible/plugins/filter:'
'{}/filter_plugins'.format( '{}/filter_plugins'.format(
constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'filter'),
os.path.join(cwd, 'filter'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR
) )
) )
env['ANSIBLE_ROLES_PATH'] = os.path.expanduser( env['ANSIBLE_ROLES_PATH'] = (
'{}/.ansible/roles:'
'{}:{}:'
'/usr/share/ansible/tripleo-roles:' '/usr/share/ansible/tripleo-roles:'
'/usr/share/ansible/roles:' '/usr/share/ansible/roles:'
'/usr/share/ceph-ansible/roles:' '/usr/share/ceph-ansible/roles:'
'/etc/ansible/roles:' '/etc/ansible/roles:'
'{}/roles'.format( '{}/roles'.format(
constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'roles'),
os.path.join(cwd, 'roles'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR
) )
) )