From 6aa32d3e9d82e9b318c1a150e2c391ac33e469cf Mon Sep 17 00:00:00 2001 From: Gaurav Rastogi Date: Tue, 9 May 2017 03:20:57 -0700 Subject: [PATCH] Added no_log flag for all the sensitive fields. (#24386) --- lib/ansible/modules/network/avi/avi_analyticsprofile.py | 6 +++--- lib/ansible/modules/network/avi/avi_cloud.py | 4 ++-- lib/ansible/modules/network/avi/avi_cloudconnectoruser.py | 2 +- lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/ansible/modules/network/avi/avi_analyticsprofile.py b/lib/ansible/modules/network/avi/avi_analyticsprofile.py index 9b47f9fb9a..07af299991 100644 --- a/lib/ansible/modules/network/avi/avi_analyticsprofile.py +++ b/lib/ansible/modules/network/avi/avi_analyticsprofile.py @@ -108,9 +108,9 @@ options: client_log_config: description: - Configure which logs are sent to the avi controller from ses and how they are processed. - client_log_syslog_config: + client_log_streaming_config: description: - - Configure to send logs to a remote syslog server. + - Configure to stream logs to an external server. - Field introduced in 17.1.1. version_added: "2.4" conn_lossy_ooo_threshold: @@ -460,7 +460,7 @@ def main(): apdex_server_rtt_threshold=dict(type='int',), apdex_server_rtt_tolerated_factor=dict(type='float',), client_log_config=dict(type='dict',), - client_log_syslog_config=dict(type='dict',), + client_log_streaming_config=dict(type='dict',), conn_lossy_ooo_threshold=dict(type='int',), conn_lossy_timeo_rexmt_threshold=dict(type='int',), conn_lossy_total_rexmt_threshold=dict(type='int',), diff --git a/lib/ansible/modules/network/avi/avi_cloud.py b/lib/ansible/modules/network/avi/avi_cloud.py index d883ca3c83..71eb827431 100644 --- a/lib/ansible/modules/network/avi/avi_cloud.py +++ b/lib/ansible/modules/network/avi/avi_cloud.py @@ -75,7 +75,7 @@ options: east_west_ipam_provider_ref: description: - Ipam profile for east-west services. - - Please use virtual subnets in this ipam profile that do not conflict with the underlay networks or any overlay networks in the cluster. + - Warning - please use virtual subnets in this ipam profile that do not conflict with the underlay networks or any overlay networks in the cluster. - For example in aws and gcp, 169.254.0.0/16 is used for storing instance metadata. - Hence, it should not be used in this profile. - It is a reference to an object of type ipamdnsproviderprofile. @@ -158,7 +158,7 @@ extends_documentation_fragment: EXAMPLES = ''' - - name: Create a VMWare cloud with write access mode + - name: Create a VMware cloud with write access mode avi_cloud: username: '' controller: '' diff --git a/lib/ansible/modules/network/avi/avi_cloudconnectoruser.py b/lib/ansible/modules/network/avi/avi_cloudconnectoruser.py index 936c6b54b8..efaaa24ee6 100644 --- a/lib/ansible/modules/network/avi/avi_cloudconnectoruser.py +++ b/lib/ansible/modules/network/avi/avi_cloudconnectoruser.py @@ -101,7 +101,7 @@ def main(): state=dict(default='present', choices=['absent', 'present']), name=dict(type='str', required=True), - private_key=dict(type='str',), + private_key=dict(type='str', no_log=True,), public_key=dict(type='str',), tenant_ref=dict(type='str',), url=dict(type='str',), diff --git a/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py b/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py index 0fc86fd62d..22b66cf748 100644 --- a/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py +++ b/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py @@ -149,7 +149,7 @@ def main(): enckey_base64=dict(type='str',), enckey_name=dict(type='str',), hardwaresecuritymodulegroup_ref=dict(type='str',), - key=dict(type='str',), + key=dict(type='str', no_log=True,), key_params=dict(type='dict',), name=dict(type='str', required=True), status=dict(type='str',),