openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add non-string value support for CephAnsibleEnvironmentVariables"

Browse Source
This commit is contained in:
Zuul 2020-05-27 12:04:00 +00:00 committed by Gerrit Code Review
commit ab4e5577a4
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
ci/environments/scenario001-standalone.yaml
View File

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

4
ci/environments/scenario004-standalone.yaml
View File

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

4
ci/environments/scenario010-standalone.yaml
View File

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

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

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