Merge "Add non-string value support for CephAnsibleEnvironmentVariables" into stable/train
This commit is contained in:
commit
ff03792e48
|
@ -148,8 +148,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
|
||||||
CinderRbdExtraPools: altrbd
|
CinderRbdExtraPools: altrbd
|
||||||
|
|
|
@ -126,8 +126,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
|
||||||
|
|
|
@ -63,8 +63,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
|
||||||
|
|
|
@ -64,8 +64,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"
|
||||||
|
|
|
@ -726,7 +726,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:
|
||||||
|
|
Loading…
Reference in New Issue