From 51c0d46056544d4012ab6f3322a5c47bbe9741ae Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Thu, 31 Aug 2017 11:12:48 -0400 Subject: [PATCH] Fix config base.yml defs with wrong keywords. (#28833) Mostly vault related items using 'desc' instead of 'description' --- lib/ansible/config/base.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index d3a7a7b7420..4ba8c460df1 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -1047,32 +1047,29 @@ DEFAULT_VAR_COMPRESSION_LEVEL: yaml: {key: defaults.var_compression_level} DEFAULT_VAULT_ID_MATCH: default: False - desc: 'If true, decrypting vaults with a vault id will only try the password from the matching vault-id' + description: 'If true, decrypting vaults with a vault id will only try the password from the matching vault-id' env: [{name: ANSIBLE_VAULT_ID_MATCH}] ini: - {key: vault_id_match, section: defaults} - vars: [] yaml: {key: defaults.vault_id_match} DEFAULT_VAULT_IDENTITY: default: default - desc: 'TODO: write it' + description: 'The label to use for the default vault id label in cases where a vault id label is not provided' env: [{name: ANSIBLE_VAULT_IDENTITY}] ini: - {key: vault_identity, section: defaults} - vars: [] yaml: {key: defaults.vault_identity} DEFAULT_VAULT_IDENTITY_LIST: default: [] - desc: 'A list of vault-ids to use by default. Equivalent to multiple --vault-id args. Vault-ids are tried in order.' + description: 'A list of vault-ids to use by default. Equivalent to multiple --vault-id args. Vault-ids are tried in order.' env: [{name: ANSIBLE_VAULT_IDENTITY_LIST}] ini: - {key: vault_identity_list, section: defaults} type: list - vars: [] yaml: {key: defaults.vault_identity_list} DEFAULT_VAULT_PASSWORD_FILE: default: ~ - description: 'TODO: write it' + description: 'The vault password file to use. Equivalent to --vault-password-file or --vault-id' env: [{name: ANSIBLE_VAULT_PASSWORD_FILE}] ini: - {key: vault_password_file, section: defaults}