openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Parameterize ceph-ansible environment variables" into stable/pike

This commit is contained in:
Zuul 2018-01-31 09:24:28 +00:00 committed by Gerrit Code Review
parent 78f2a4c516 75a2d519cb
commit e85c01bc58
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/environments/scenario001-multinode-containers.yaml
View File

@ -132,6 +132,10 @@ parameter_defaults:
CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
CephAnsiblePlaybookVerbosity: 1
CephAnsibleEnvironmentVariables:
ANSIBLE_SSH_RETRIES: '4'
DEFAULT_FORKS: '3'
NovaEnableRbdBackend: true
CinderEnableRbdBackend: true
CinderBackupBackend: ceph

5
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -136,6 +136,10 @@ parameters:
default: 0
description: number of '-v', '-vv', etc. passed to ansible-playbook command (max 5)
type: number
CephAnsibleEnvironmentVariables:
default: {}
description: Mapping of Ansible environment variables to override defaults.
type: json
conditions:
custom_registry_host:
@ -198,6 +202,7 @@ outputs:
- {get_param: CephAnsiblePlaybook}
ansible_playbook_verbosity: {get_param: CephAnsiblePlaybookVerbosity}
node_data_lookup: {get_param: NodeDataLookup}
ansible_env_variables: {get_param: CephAnsibleEnvironmentVariables}
config_settings:
ceph_common_ansible_vars:
ireallymeanit: 'yes'