Browse Source

Merge "Add non-string value support for CephAnsibleEnvironmentVariables" into stable/train

changes/61/745761/1
Zuul 12 months ago
committed by Gerrit Code Review
parent
commit
ff03792e48
  1. 4
      ci/environments/scenario001-multinode-containers.yaml
  2. 4
      ci/environments/scenario001-standalone.yaml
  3. 4
      ci/environments/scenario004-standalone.yaml
  4. 4
      ci/environments/scenario010-standalone.yaml
  5. 2
      deployment/ceph-ansible/ceph-base.yaml

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

@ -148,8 +148,8 @@ parameter_defaults:
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
CephAnsiblePlaybookVerbosity: 1
CephAnsibleEnvironmentVariables:
ANSIBLE_SSH_RETRIES: '4'
DEFAULT_FORKS: '3'
ANSIBLE_SSH_RETRIES: 4
DEFAULT_FORKS: 3
NovaEnableRbdBackend: true
CinderEnableRbdBackend: true
CinderRbdExtraPools: altrbd

4
ci/environments/scenario001-standalone.yaml

@ -126,8 +126,8 @@ parameter_defaults:
dashboard_enabled: false
CephAnsiblePlaybookVerbosity: 1
CephAnsibleEnvironmentVariables:
ANSIBLE_SSH_RETRIES: '4'
DEFAULT_FORKS: '3'
ANSIBLE_SSH_RETRIES: 4
DEFAULT_FORKS: 3
NovaEnableRbdBackend: true
CinderEnableRbdBackend: true
CinderBackupBackend: ceph

4
ci/environments/scenario004-standalone.yaml

@ -63,8 +63,8 @@ parameter_defaults:
CephAnsiblePlaybookVerbosity: 1
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
CephAnsibleEnvironmentVariables:
ANSIBLE_SSH_RETRIES: '4'
DEFAULT_FORKS: '3'
ANSIBLE_SSH_RETRIES: 4
DEFAULT_FORKS: 3
ManilaCephFSDataPoolPGNum: 16
ManilaCephFSMetadataPoolPGNum: 16
NovaEnableRbdBackend: true

4
ci/environments/scenario010-standalone.yaml

@ -64,8 +64,8 @@ parameter_defaults:
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
CephAnsiblePlaybookVerbosity: 1
CephAnsibleEnvironmentVariables:
ANSIBLE_SSH_RETRIES: '4'
DEFAULT_FORKS: '3'
ANSIBLE_SSH_RETRIES: 4
DEFAULT_FORKS: 3
NovaEnableRbdBackend: true
CinderEnableRbdBackend: true
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"

2
deployment/ceph-ansible/ceph-base.yaml

@ -726,7 +726,7 @@ outputs:
ceph_ansible_environment_variables:
yaql:
data: {get_param: CephAnsibleEnvironmentVariables}
expression: $.data.items().select($[0] + '=' + $[1])
expression: $.data.items().select($.join('='))
ceph_ansible_skip_tags: {get_param: CephAnsibleSkipTags}
- name: get ssh private key
include_role:

Loading…
Cancel
Save