diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-29 11:07:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 11:07:06 -0800 |
| commit | 6b6b422245be79dd3eec0c93a58875c646bbfba7 (patch) | |
| tree | 497e57dbc7195975f457460b884392c5730bf519 /roles | |
| parent | aff556902f5851d61df34a83dfff2b3ff891fef8 (diff) | |
| parent | 3cdcb76f55c6c47eb66c3e3ddbf973cfc1fc1b85 (diff) | |
| download | openshift-6b6b422245be79dd3eec0c93a58875c646bbfba7.tar.gz openshift-6b6b422245be79dd3eec0c93a58875c646bbfba7.tar.bz2 openshift-6b6b422245be79dd3eec0c93a58875c646bbfba7.tar.xz openshift-6b6b422245be79dd3eec0c93a58875c646bbfba7.zip | |
Merge pull request #6307 from mgugino-upstream-stage/no-log-fix
Automatic merge from submit-queue.
Fix no_log warnings for custom module
We need to set no_log for password and private_key
variables.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_router.py | 6 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_adm_router.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/roles/lib_openshift/library/oc_adm_router.py b/roles/lib_openshift/library/oc_adm_router.py index 146f71f68..5969da7ca 100644 --- a/roles/lib_openshift/library/oc_adm_router.py +++ b/roles/lib_openshift/library/oc_adm_router.py @@ -3154,14 +3154,14 @@ def main(): external_host_insecure=dict(default=False, type='bool'), external_host_partition_path=dict(default=None, type='str'), external_host_username=dict(default=None, type='str'), - external_host_password=dict(default=None, type='str'), - external_host_private_key=dict(default=None, type='str'), + external_host_password=dict(default=None, type='str', no_log=True), + external_host_private_key=dict(default=None, type='str', no_log=True), # Metrics expose_metrics=dict(default=False, type='bool'), metrics_image=dict(default=None, type='str'), # Stats stats_user=dict(default=None, type='str'), - stats_password=dict(default=None, type='str'), + stats_password=dict(default=None, type='str', no_log=True), stats_port=dict(default=1936, type='int'), # extra cacert_file=dict(default=None, type='str'), diff --git a/roles/lib_openshift/src/ansible/oc_adm_router.py b/roles/lib_openshift/src/ansible/oc_adm_router.py index c6563cc2f..52499b273 100644 --- a/roles/lib_openshift/src/ansible/oc_adm_router.py +++ b/roles/lib_openshift/src/ansible/oc_adm_router.py @@ -34,14 +34,14 @@ def main(): external_host_insecure=dict(default=False, type='bool'), external_host_partition_path=dict(default=None, type='str'), external_host_username=dict(default=None, type='str'), - external_host_password=dict(default=None, type='str'), - external_host_private_key=dict(default=None, type='str'), + external_host_password=dict(default=None, type='str', no_log=True), + external_host_private_key=dict(default=None, type='str', no_log=True), # Metrics expose_metrics=dict(default=False, type='bool'), metrics_image=dict(default=None, type='str'), # Stats stats_user=dict(default=None, type='str'), - stats_password=dict(default=None, type='str'), + stats_password=dict(default=None, type='str', no_log=True), stats_port=dict(default=1936, type='int'), # extra cacert_file=dict(default=None, type='str'), |