diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 2a15f93458..7daeafd5ff 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -127,6 +127,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 CinderRbdExtraPools: altrbd diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index b46a09a13f..58394f22a7 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -144,6 +144,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: @@ -205,6 +209,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'