openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Inject both paths for validations roles location"

This commit is contained in:
Zuul 2020-09-15 22:38:23 +00:00 committed by Gerrit Code Review
parent 4c7df58d9b cbb798dde1
commit 7d17c3ea2a
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tripleoclient/constants.py
View File

@ -93,10 +93,8 @@ ENABLE_SSH_ADMIN_SSH_PORT_TIMEOUT = 600
ADDITIONAL_ARCHITECTURES = ['ppc64le'] ADDITIONAL_ARCHITECTURES = ['ppc64le']
DEFAULT_VALIDATIONS_BASEDIR = ( DEFAULT_VALIDATIONS_BASEDIR = "/usr/share/ansible"
"/usr/share/ansible" DEFAULT_VALIDATIONS_LEGACY_BASEDIR = "/usr/share/openstack-tripleo-validations"
if os.path.exists("/usr/share/ansible/validation-playbooks")
else "/usr/share/openstack-tripleo-validations")
VALIDATIONS_LOG_BASEDIR = '/var/log/validations' VALIDATIONS_LOG_BASEDIR = '/var/log/validations'
@ -107,14 +105,19 @@ ANSIBLE_INVENTORY = os.path.join(DEFAULT_WORK_DIR,
'{}/tripleo-ansible-inventory.yaml') '{}/tripleo-ansible-inventory.yaml')
ANSIBLE_VALIDATION_DIR = ( ANSIBLE_VALIDATION_DIR = (
"/usr/share/ansible/validation-playbooks" os.path.join(DEFAULT_VALIDATIONS_LEGACY_BASEDIR, 'playbooks')
if os.path.exists("/usr/share/ansible/validation-playbooks") if os.path.join(DEFAULT_VALIDATIONS_LEGACY_BASEDIR, 'playbooks')
else "/usr/share/openstack-tripleo-validations/playbooks") else "/usr/share/ansible/validation-playbooks"
)
ANSIBLE_TRIPLEO_PLAYBOOKS = \ ANSIBLE_TRIPLEO_PLAYBOOKS = \
'/usr/share/ansible/tripleo-playbooks' '/usr/share/ansible/tripleo-playbooks'
VALIDATION_GROUPS_INFO = '%s/groups.yaml' % DEFAULT_VALIDATIONS_BASEDIR VALIDATION_GROUPS_INFO = (
'/usr/share/ansible/groups.yaml'
if os.path.exists('/usr/share/ansible/groups.yaml')
else os.path.join(DEFAULT_VALIDATIONS_LEGACY_BASEDIR, 'groups.yaml')
)
# ctlplane network defaults # ctlplane network defaults
CTLPLANE_CIDR_DEFAULT = '192.168.24.0/24' CTLPLANE_CIDR_DEFAULT = '192.168.24.0/24'

24
tripleoclient/utils.py
View File

@ -483,11 +483,13 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
'/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:'
'{}/library'.format( '{}/library'.format(
constants.CLOUD_HOME_DIR, constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'modules'), os.path.join(workdir, 'modules'),
os.path.join(cwd, 'modules'), os.path.join(cwd, 'modules'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR,
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR
) )
) )
env['ANSIBLE_LOOKUP_PLUGINS'] = os.path.expanduser( env['ANSIBLE_LOOKUP_PLUGINS'] = os.path.expanduser(
@ -496,11 +498,13 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
'/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:'
'{}/lookup_plugins'.format( '{}/lookup_plugins'.format(
constants.CLOUD_HOME_DIR, constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'lookup'), os.path.join(workdir, 'lookup'),
os.path.join(cwd, 'lookup'), os.path.join(cwd, 'lookup'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR,
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR
) )
) )
env['ANSIBLE_CALLBACK_PLUGINS'] = os.path.expanduser( env['ANSIBLE_CALLBACK_PLUGINS'] = os.path.expanduser(
@ -509,11 +513,13 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
'/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:'
'{}/callback_plugins'.format( '{}/callback_plugins'.format(
constants.CLOUD_HOME_DIR, constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'callback'), os.path.join(workdir, 'callback'),
os.path.join(cwd, 'callback'), os.path.join(cwd, 'callback'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR,
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR
) )
) )
env['ANSIBLE_ACTION_PLUGINS'] = os.path.expanduser( env['ANSIBLE_ACTION_PLUGINS'] = os.path.expanduser(
@ -522,11 +528,13 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
'/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:'
'{}/action_plugins'.format( '{}/action_plugins'.format(
constants.CLOUD_HOME_DIR, constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'action'), os.path.join(workdir, 'action'),
os.path.join(cwd, 'action'), os.path.join(cwd, 'action'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR,
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR
) )
) )
env['ANSIBLE_FILTER_PLUGINS'] = os.path.expanduser( env['ANSIBLE_FILTER_PLUGINS'] = os.path.expanduser(
@ -535,11 +543,13 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
'/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:'
'{}/filter_plugins'.format( '{}/filter_plugins'.format(
constants.CLOUD_HOME_DIR, constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'filter'), os.path.join(workdir, 'filter'),
os.path.join(cwd, 'filter'), os.path.join(cwd, 'filter'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR,
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR
) )
) )
env['ANSIBLE_ROLES_PATH'] = os.path.expanduser( env['ANSIBLE_ROLES_PATH'] = os.path.expanduser(
@ -549,11 +559,13 @@ def run_ansible_playbook(playbook, inventory, workdir, playbook_dir=None,
'/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:'
'{}/roles'.format( '{}/roles'.format(
constants.CLOUD_HOME_DIR, constants.CLOUD_HOME_DIR,
os.path.join(workdir, 'roles'), os.path.join(workdir, 'roles'),
os.path.join(cwd, 'roles'), os.path.join(cwd, 'roles'),
constants.DEFAULT_VALIDATIONS_BASEDIR constants.DEFAULT_VALIDATIONS_BASEDIR,
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR
) )
) )
env['ANSIBLE_CALLBACK_WHITELIST'] = callback_whitelist env['ANSIBLE_CALLBACK_WHITELIST'] = callback_whitelist