openstack/tripleo-common
Code Issues Proposed changes

Merge "Switch to tripleo_dense"

Browse Source
This commit is contained in:
Zuul 2020-05-30 09:17:24 +00:00 committed by Gerrit Code Review
commit ed7049ee84
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tripleo_common/actions/ansible.py
View File

@ -61,7 +61,7 @@ def write_default_ansible_cfg(work_dir,
'/usr/share/ansible/tripleo-plugins/callback:'
'/usr/share/ansible/plugins/callback:'
'%s/callback_plugins' % constants.DEFAULT_VALIDATIONS_BASEDIR)
callbacks_whitelist = ','.join(['tripleo', 'profile_tasks'])
callbacks_whitelist = ','.join(['tripleo_dense', 'tripleo_profile_tasks'])
action_plugins_path = (
'~/.ansible/plugins/action:'
'/usr/share/ansible/plugins/action:'
@ -420,8 +420,9 @@ class AnsiblePlaybookAction(base.TripleOAction):
env_variables.update({
# the whitelist could be collected from multiple
# arguments if we find a use case for it
'ANSIBLE_CALLBACK_WHITELIST': 'tripleo,profile_tasks',
'ANSIBLE_STDOUT_CALLBACK': 'tripleo',
'ANSIBLE_CALLBACK_WHITELIST':
'tripleo_dense,tripleo_profile_tasks',
'ANSIBLE_STDOUT_CALLBACK': 'tripleo_dense',
'PROFILE_TASKS_TASK_OUTPUT_LIMIT':
six.text_type(self.profile_tasks_limit),
})

5
tripleo_common/tests/actions/test_ansible.py
View File

@ -71,8 +71,9 @@ class AnsiblePlaybookActionTest(base.TestCase):
'HOME': action.work_dir,
'ANSIBLE_LOCAL_TEMP': action.work_dir,
'ANSIBLE_CONFIG': ansible_config_path,
'ANSIBLE_CALLBACK_WHITELIST': 'tripleo,profile_tasks',
'ANSIBLE_STDOUT_CALLBACK': 'tripleo',
'ANSIBLE_CALLBACK_WHITELIST':
'tripleo_dense,tripleo_profile_tasks',
'ANSIBLE_STDOUT_CALLBACK': 'tripleo_dense',
'PROFILE_TASKS_TASK_OUTPUT_LIMIT': '20',
}
python_version = sys.version_info.major