Merge "Introduce {{role.name}}ExtraGroupVars"
This commit is contained in:
commit
96d785cb1b
|
@ -66,3 +66,5 @@ parameter_defaults:
|
||||||
- test_volume:/testvol
|
- test_volume:/testvol
|
||||||
NovaComputeOptVolumes:
|
NovaComputeOptVolumes:
|
||||||
- test_volume:/testvol
|
- test_volume:/testvol
|
||||||
|
StandaloneExtraGroupVars:
|
||||||
|
cinder_fake_group_var_one: var_one_override
|
||||||
|
|
|
@ -49,11 +49,26 @@ outputs:
|
||||||
config_settings: {}
|
config_settings: {}
|
||||||
step_config: ''
|
step_config: ''
|
||||||
service_config_settings: {}
|
service_config_settings: {}
|
||||||
|
ansible_group_vars:
|
||||||
|
cinder_fake_group_var_one: var_one
|
||||||
|
cinder_fake_group_var_two: var_two
|
||||||
deploy_steps_tasks:
|
deploy_steps_tasks:
|
||||||
- name: Manage test container volume
|
- name: Manage test container volume
|
||||||
when:
|
when:
|
||||||
- step|int == 2
|
- step|int == 2
|
||||||
block:
|
block:
|
||||||
|
- name: Test that cinder_fake_group_var_one was overridden
|
||||||
|
assert:
|
||||||
|
that:
|
||||||
|
- cinder_fake_group_var_one == 'var_one_override'
|
||||||
|
fail_msg: "cinder_fake_group_var_one was not overriden"
|
||||||
|
success_msg: "cinder_fake_group_var_one was overriden"
|
||||||
|
- name: Test that cinder_fake_group_var_two was not overridden
|
||||||
|
assert:
|
||||||
|
that:
|
||||||
|
- cinder_fake_group_var_two == 'var_two'
|
||||||
|
fail_msg: "cinder_fake_group_var_two was overriden"
|
||||||
|
success_msg: "cinder_fake_group_var_two was not overriden"
|
||||||
- name: Create Test Volume facts
|
- name: Create Test Volume facts
|
||||||
set_fact:
|
set_fact:
|
||||||
test_container_cli: {get_param: ContainerCli}
|
test_container_cli: {get_param: ContainerCli}
|
||||||
|
|
|
@ -272,6 +272,11 @@ parameters:
|
||||||
type: json
|
type: json
|
||||||
description: Optional Role Specific parameters to be provided to service
|
description: Optional Role Specific parameters to be provided to service
|
||||||
default: {}
|
default: {}
|
||||||
|
|
||||||
|
{{role.name}}ExtraGroupVars:
|
||||||
|
type: json
|
||||||
|
description: Optional extra Ansible group vars
|
||||||
|
default: {}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
# Identifiers to trigger tasks on nodes
|
# Identifiers to trigger tasks on nodes
|
||||||
|
@ -1198,6 +1203,7 @@ outputs:
|
||||||
neutron_physical_bridge_name: {get_param: NeutronPhysicalBridge}
|
neutron_physical_bridge_name: {get_param: NeutronPhysicalBridge}
|
||||||
neutron_public_interface_name: {get_param: NeutronPublicInterface}
|
neutron_public_interface_name: {get_param: NeutronPublicInterface}
|
||||||
network_deployment_actions: {get_attr: [{{role.name}}NetworkDeploymentActionsValue, value]}
|
network_deployment_actions: {get_attr: [{{role.name}}NetworkDeploymentActionsValue, value]}
|
||||||
|
- {get_param: {{role.name}}ExtraGroupVars}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
RoleNetHostnameMap:
|
RoleNetHostnameMap:
|
||||||
description: Mapping of each network to a list of hostnames for each role
|
description: Mapping of each network to a list of hostnames for each role
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Introduce "{{role.name}}ExtraGroupVars" which allows to define
|
||||||
|
a dictionary of Ansible group vars per role.
|
||||||
|
These extra group vars will override any pre-defined group var from a
|
||||||
|
service.
|
Loading…
Reference in New Issue