Merge "Revert "Remove os-collect-config related poperties and attributes""
This commit is contained in:
commit
437784cbe3
|
@ -1095,6 +1095,15 @@ resources:
|
||||||
{{role.name}}HieradataVars: {get_attr: [{{role.name}}HieradataVars, value]}
|
{{role.name}}HieradataVars: {get_attr: [{{role.name}}HieradataVars, value]}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
|
ServerOsCollectConfigData:
|
||||||
|
type: OS::Heat::Value
|
||||||
|
properties:
|
||||||
|
type: json
|
||||||
|
value:
|
||||||
|
{%- for role in roles %}
|
||||||
|
{{role.name}}: {get_attr: [{{role.name}}, attributes, os_collect_config]}
|
||||||
|
{%- endfor %}
|
||||||
|
|
||||||
DeployedServerEnvironment:
|
DeployedServerEnvironment:
|
||||||
type: OS::TripleO::DeployedServerEnvironment
|
type: OS::TripleO::DeployedServerEnvironment
|
||||||
properties:
|
properties:
|
||||||
|
@ -1112,6 +1121,20 @@ resources:
|
||||||
{%- for role in roles %}
|
{%- for role in roles %}
|
||||||
- {get_attr: [{{role.name}}, deployed_server_port_map]}
|
- {get_attr: [{{role.name}}, deployed_server_port_map]}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
DeployedServerDeploymentSwiftDataMap:
|
||||||
|
map_merge:
|
||||||
|
list_concat:
|
||||||
|
{%- for role in roles %}
|
||||||
|
- {get_attr: [{{role.name}}, deployed_server_deployment_swift_data_map]}
|
||||||
|
{%- endfor %}
|
||||||
|
DefaultRouteIp:
|
||||||
|
str_split:
|
||||||
|
- ':'
|
||||||
|
- str_split:
|
||||||
|
- '/'
|
||||||
|
- {get_attr: [ServerOsCollectConfigData, value, {{primary_role_name}}, '0', request, metadata_url]}
|
||||||
|
- 2
|
||||||
|
- 0
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
ManagedEndpoints:
|
ManagedEndpoints:
|
||||||
|
@ -1187,6 +1210,9 @@ outputs:
|
||||||
{%- for role in roles %}
|
{%- for role in roles %}
|
||||||
{{role.name}}: {{role.tags|default([])}}
|
{{role.name}}: {{role.tags|default([])}}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
ServerOsCollectConfigData:
|
||||||
|
description: The os-collect-config configuration associated with each server resource
|
||||||
|
value: {get_attr: [ServerOsCollectConfigData, value]}
|
||||||
VipMap:
|
VipMap:
|
||||||
description: Mapping of each network to VIP addresses. Also includes the Redis VIP.
|
description: Mapping of each network to VIP addresses. Also includes the Redis VIP.
|
||||||
value:
|
value:
|
||||||
|
|
|
@ -406,6 +406,10 @@ resources:
|
||||||
{{server_resource_name}}:
|
{{server_resource_name}}:
|
||||||
type: OS::TripleO::{{role.name}}Server
|
type: OS::TripleO::{{role.name}}Server
|
||||||
deletion_policy: {get_param: ServerDeletionPolicy}
|
deletion_policy: {get_param: ServerDeletionPolicy}
|
||||||
|
metadata:
|
||||||
|
os-collect-config:
|
||||||
|
command: {get_param: ConfigCommand}
|
||||||
|
splay: {get_param: ConfigCollectSplay}
|
||||||
properties:
|
properties:
|
||||||
image:
|
image:
|
||||||
{%- if role.deprecated_param_image is defined %}
|
{%- if role.deprecated_param_image is defined %}
|
||||||
|
@ -893,6 +897,31 @@ outputs:
|
||||||
- '-'
|
- '-'
|
||||||
- - {get_param: Hostname}
|
- - {get_param: Hostname}
|
||||||
- ctlplane
|
- ctlplane
|
||||||
|
deployed_server_deployment_swift_data_map:
|
||||||
|
description:
|
||||||
|
Map of Heat created hostname of the server to the Swift container and object
|
||||||
|
used to created the temporary url for metadata polling with
|
||||||
|
os-collect-config.
|
||||||
|
value:
|
||||||
|
map_replace:
|
||||||
|
- hostname:
|
||||||
|
container:
|
||||||
|
str_split:
|
||||||
|
- '/'
|
||||||
|
- {get_attr: [{{server_resource_name}}, os_collect_config, request, metadata_url]}
|
||||||
|
- 5
|
||||||
|
object:
|
||||||
|
str_split:
|
||||||
|
- '?'
|
||||||
|
- str_split:
|
||||||
|
- '/'
|
||||||
|
- {get_attr: [{{server_resource_name}}, os_collect_config, request, metadata_url]}
|
||||||
|
- 6
|
||||||
|
- 0
|
||||||
|
- keys: {hostname: {get_param: Hostname}}
|
||||||
|
os_collect_config:
|
||||||
|
description: The os-collect-config configuration associated with this server resource
|
||||||
|
value: {get_attr: [{{server_resource_name}}, os_collect_config]}
|
||||||
{%- for network in networks %}
|
{%- for network in networks %}
|
||||||
{%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
|
{%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
|
||||||
{{network.name_lower|default(network.name.lower())}}_ip_address:
|
{{network.name_lower|default(network.name.lower())}}_ip_address:
|
||||||
|
|
Loading…
Reference in New Issue