Merge "Pass CephAnsibleExtraConfig as ansible extra-vars" into stable/queens
This commit is contained in:
commit
b96a602829
|
@ -143,11 +143,11 @@ workflows:
|
|||
nfs_vars: <% env().get('role_merged_configs', {}).values().select($.get('ceph_nfs_ansible_vars', {})).aggregate($1 + $2) %>
|
||||
rbdmirror_vars: <% env().get('role_merged_configs', {}).values().select($.get('ceph_rbdmirror_ansible_vars', {})).aggregate($1 + $2) %>
|
||||
client_vars: <% env().get('role_merged_configs', {}).values().select($.get('ceph_client_ansible_vars', {})).aggregate($1 + $2) %>
|
||||
on-success: build_extra_vars
|
||||
build_extra_vars:
|
||||
on-success: build_group_vars
|
||||
build_group_vars:
|
||||
publish:
|
||||
# NOTE(gfidente): merge vars from all ansible roles
|
||||
extra_vars: <% {'fetch_directory'=> $.fetch_directory} + $.mgr_vars + $.mon_vars + $.osd_vars + $.mds_vars + $.rgw_vars + $.nfs_vars + $.client_vars + $.rbdmirror_vars + $.ceph_ansible_extra_vars %>
|
||||
group_vars: <% {'fetch_directory'=> $.fetch_directory} + $.mgr_vars + $.mon_vars + $.osd_vars + $.mds_vars + $.rgw_vars + $.nfs_vars + $.client_vars + $.rbdmirror_vars %>
|
||||
on-success: ceph_install
|
||||
ceph_install:
|
||||
with-items: playbook in <% list($.ceph_ansible_playbook).flatten() %>
|
||||
|
@ -173,7 +173,7 @@ workflows:
|
|||
clients:
|
||||
hosts: <% let(root => $) -> $.client_ips.toDict($, $root.ips_data.get($, {})) %>
|
||||
all:
|
||||
vars: <% $.extra_vars %>
|
||||
vars: <% $.group_vars %>
|
||||
playbook: <% $.playbook %>
|
||||
remote_user: tripleo-admin
|
||||
become: true
|
||||
|
@ -182,8 +182,7 @@ workflows:
|
|||
ssh_private_key: <% $.private_key %>
|
||||
skip_tags: <% $.ansible_skip_tags %>
|
||||
extra_env_variables: <% $.ansible_extra_env_variables.mergeWith($.ansible_env_variables) %>
|
||||
extra_vars:
|
||||
ireallymeanit: 'yes'
|
||||
extra_vars: <% {'ireallymeanit' => 'yes'} + $.ceph_ansible_extra_vars %>
|
||||
on-complete: save_fetch_directory
|
||||
save_fetch_directory:
|
||||
action: tripleo.files.save_temp_dir_to_swift
|
||||
|
|
Loading…
Reference in New Issue