openstack
/
tripleo-common
Code Issues Proposed changes

Switch to tripleo_dense 

Change-Id: Iff8eec43bd73bc6486f56e741e740869d1b8acbb
Depends-On: https://review.opendev.org/#/c/726479/
(cherry picked from commit 0186702a41)
This commit is contained in:
Alex Schultz 2020-05-08 15:59:40 -06:00
parent 883b01e626
commit 8bae698dcc
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleo_common/actions/ansible.py
View File

@ -69,7 +69,7 @@ def write_default_ansible_cfg(work_dir,
'{}/callback_plugins'.format(
constants.DEFAULT_VALIDATIONS_BASEDIR,
constants.DEFAULT_VALIDATIONS_LEGACY_BASEDIR))
callbacks_whitelist = ','.join(['tripleo', 'profile_tasks',
callbacks_whitelist = ','.join(['tripleo_dense', 'tripleo_profile_tasks',
'tripleo_states'])
action_plugins_path = (
'~/.ansible/plugins/action:'
@ -107,7 +107,7 @@ def write_default_ansible_cfg(work_dir,
config.set('defaults', 'library', modules_path)
config.set('defaults', 'callback_plugins', callbacks_path)
config.set('defaults', 'callback_whitelist', callbacks_whitelist)
config.set('defaults', 'stdout_callback', 'tripleo')
config.set('defaults', 'stdout_callback', 'tripleo_dense')
config.set('defaults', 'action_plugins', action_plugins_path)
config.set('defaults', 'lookup_plugins', lookups_path)
config.set('defaults', 'filter_plugins', filter_plugins_path)
@ -621,8 +621,8 @@ class AnsiblePlaybookAction(base.TripleOAction):
# the whitelist could be collected from multiple
# arguments if we find a use case for it
'ANSIBLE_CALLBACK_WHITELIST':
'tripleo,profile_tasks,tripleo_states',
'ANSIBLE_STDOUT_CALLBACK': 'tripleo',
'tripleo_dense,tripleo_profile_tasks,tripleo_states',
'ANSIBLE_STDOUT_CALLBACK': 'tripleo_dense',
'PROFILE_TASKS_TASK_OUTPUT_LIMIT':
six.text_type(self.profile_tasks_limit),
})

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

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