Fix config base.yml defs with wrong keywords. (#28833)

Mostly vault related items using 'desc' instead of 'description'
This commit is contained in:
Adrian Likins 2017-08-31 11:12:48 -04:00 committed by GitHub
parent 8035e68d44
commit 51c0d46056

View file

@ -1047,32 +1047,29 @@ DEFAULT_VAR_COMPRESSION_LEVEL:
yaml: {key: defaults.var_compression_level} yaml: {key: defaults.var_compression_level}
DEFAULT_VAULT_ID_MATCH: DEFAULT_VAULT_ID_MATCH:
default: False 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}] env: [{name: ANSIBLE_VAULT_ID_MATCH}]
ini: ini:
- {key: vault_id_match, section: defaults} - {key: vault_id_match, section: defaults}
vars: []
yaml: {key: defaults.vault_id_match} yaml: {key: defaults.vault_id_match}
DEFAULT_VAULT_IDENTITY: DEFAULT_VAULT_IDENTITY:
default: default 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}] env: [{name: ANSIBLE_VAULT_IDENTITY}]
ini: ini:
- {key: vault_identity, section: defaults} - {key: vault_identity, section: defaults}
vars: []
yaml: {key: defaults.vault_identity} yaml: {key: defaults.vault_identity}
DEFAULT_VAULT_IDENTITY_LIST: DEFAULT_VAULT_IDENTITY_LIST:
default: [] 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}] env: [{name: ANSIBLE_VAULT_IDENTITY_LIST}]
ini: ini:
- {key: vault_identity_list, section: defaults} - {key: vault_identity_list, section: defaults}
type: list type: list
vars: []
yaml: {key: defaults.vault_identity_list} yaml: {key: defaults.vault_identity_list}
DEFAULT_VAULT_PASSWORD_FILE: DEFAULT_VAULT_PASSWORD_FILE:
default: ~ 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}] env: [{name: ANSIBLE_VAULT_PASSWORD_FILE}]
ini: ini:
- {key: vault_password_file, section: defaults} - {key: vault_password_file, section: defaults}