openstack
/
tripleo-common
Code Issues Proposed changes

Remove references to tripleo-validations legacy directory 

'/usr/share/openstack-tripleo-validations' doesn't exist anymore since
Train. Tripleo-validations installs its bits in '/usr/share/ansible/'.
It is now quite safe to remove the references to this legacy directory.

**Note**
This patch will be applied to master and stable/wallaby only. This logic
will be kept as is for stable/train like this directory may still be
present during an upgrade.

Change-Id: Ib96e2c0dd789be2be6bdaf66682b985cb864baf8
Signed-off-by: Gael Chamoulaud (Strider) <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud (Strider) 2021-06-02 09:13:24 +02:00
parent 9026107567
commit 755cc6095d
No known key found for this signature in database
GPG Key ID: 4119D0305C651D66
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleo_common/constants.py
View File

@ -58,7 +58,6 @@ DEFAULT_TEMPLATES_PATH = '/usr/share/openstack-tripleo-heat-templates/'
#: The path to the base directory of tripleo-validations #: The path to the base directory of tripleo-validations
DEFAULT_VALIDATIONS_BASEDIR = "/usr/share/ansible" DEFAULT_VALIDATIONS_BASEDIR = "/usr/share/ansible"
DEFAULT_VALIDATIONS_LEGACY_BASEDIR = "/usr/share/openstack-tripleo-validations"
# The path to the tripleo validations installed on the undercloud # The path to the tripleo validations installed on the undercloud
DEFAULT_VALIDATIONS_PATH = "{}/validation-playbooks/".format( DEFAULT_VALIDATIONS_PATH = "{}/validation-playbooks/".format(

30
tripleo_common/utils/ansible.py
View File

@ -47,25 +47,20 @@ def write_default_ansible_cfg(work_dir,
'/usr/share/ansible/tripleo-plugins/modules:' '/usr/share/ansible/tripleo-plugins/modules:'
'/usr/share/ansible/plugins/modules:' '/usr/share/ansible/plugins/modules:'
'/usr/share/ansible-modules:' '/usr/share/ansible-modules:'
'{}/library:' '{}/library'.format(
'{}/library'.format(constants.DEFAULT_VALIDATIONS_BASEDIR, constants.DEFAULT_VALIDATIONS_BASEDIR))
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR))
lookups_path = ( lookups_path = (
'/root/.ansible/plugins/lookup:' '/root/.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:'
'{}/lookup_plugins:'
'{}/lookup_plugins'.format( '{}/lookup_plugins'.format(
constants.DEFAULT_VALIDATIONS_BASEDIR, constants.DEFAULT_VALIDATIONS_BASEDIR))
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR))
callbacks_path = ( callbacks_path = (
'~/.ansible/plugins/callback:' '~/.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:'
'{}/callback_plugins:'
'{}/callback_plugins'.format( '{}/callback_plugins'.format(
constants.DEFAULT_VALIDATIONS_BASEDIR, constants.DEFAULT_VALIDATIONS_BASEDIR))
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR))
callbacks_whitelist = ','.join(['tripleo_dense', 'tripleo_profile_tasks', callbacks_whitelist = ','.join(['tripleo_dense', 'tripleo_profile_tasks',
'tripleo_states']) 'tripleo_states'])
@ -73,29 +68,20 @@ def write_default_ansible_cfg(work_dir,
'~/.ansible/plugins/action:' '~/.ansible/plugins/action:'
'/usr/share/ansible/plugins/action:' '/usr/share/ansible/plugins/action:'
'/usr/share/ansible/tripleo-plugins/action:' '/usr/share/ansible/tripleo-plugins/action:'
'{}/action_plugins:'
'{}/action_plugins'.format( '{}/action_plugins'.format(
constants.DEFAULT_VALIDATIONS_BASEDIR, constants.DEFAULT_VALIDATIONS_BASEDIR))
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR))
filter_plugins_path = ( filter_plugins_path = (
'~/.ansible/plugins/filter:' '~/.ansible/plugins/filter:'
'/usr/share/ansible/plugins/filter:' '/usr/share/ansible/plugins/filter:'
'/usr/share/ansible/tripleo-plugins/filter:' '/usr/share/ansible/tripleo-plugins/filter:'
'{}/filter_plugins:'
'{}/filter_plugins'.format( '{}/filter_plugins'.format(
constants.DEFAULT_VALIDATIONS_BASEDIR, constants.DEFAULT_VALIDATIONS_BASEDIR))
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR)) roles_path = ('{work_dir!s}/roles:'
roles_path = ('%(work_dir)s/roles:'
'/root/.ansible/roles:' '/root/.ansible/roles:'
'/usr/share/ansible/tripleo-roles:' '/usr/share/ansible/tripleo-roles:'
'/usr/share/ansible/roles:' '/usr/share/ansible/roles:'
'/etc/ansible/roles:' '/etc/ansible/roles:'
'%(ooo_val_path)s/roles:' '{work_dir!s}'.format(work_dir=work_dir))
'%(work_dir)s' % {
'work_dir': work_dir,
'ooo_val_path':
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR
})
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(ansible_config_path) config.read(ansible_config_path)