Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move neutron-related options for nova to base profile
[apex-tripleo-heat-templates.git]
/
puppet
/
cinder-storage.yaml
diff --git
a/puppet/cinder-storage.yaml
b/puppet/cinder-storage.yaml
index
7f45b83
..
28f1686
100644
(file)
--- a/
puppet/cinder-storage.yaml
+++ b/
puppet/cinder-storage.yaml
@@
-1,9
+1,11
@@
heat_template_version: 2015-04-30
description: 'OpenStack cinder storage configured by Puppet'
parameters:
heat_template_version: 2015-04-30
description: 'OpenStack cinder storage configured by Puppet'
parameters:
- Image:
- default: overcloud-
cinder-volume
+
BlockStorage
Image:
+ default: overcloud-
full
type: string
type: string
+ constraints:
+ - custom_constraint: glance.image
ExtraConfig:
default: {}
description: |
ExtraConfig:
default: {}
description: |
@@
-35,10
+37,6
@@
parameters:
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true
- NtpServer:
- default: ''
- description: Comma-separated list of ntp servers
- type: comma_delimited_list
EnablePackageInstall:
default: 'false'
description: Set to true to enable package installation via Puppet
EnablePackageInstall:
default: 'false'
description: Set to true to enable package installation via Puppet
@@
-61,10
+59,6
@@
parameters:
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry.
type: json
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry.
type: json
- TimeZone:
- default: 'UTC'
- description: The timezone to be set on Cinder nodes.
- type: string
NetworkDeploymentActions:
type: comma_delimited_list
description: >
NetworkDeploymentActions:
type: comma_delimited_list
description: >
@@
-89,7
+83,7
@@
parameters:
Extra properties or metadata passed to Nova for the created nodes in
the overcloud. It's accessible via the Nova metadata API.
type: json
Extra properties or metadata passed to Nova for the created nodes in
the overcloud. It's accessible via the Nova metadata API.
type: json
- SchedulerHints:
+
BlockStorage
SchedulerHints:
type: json
description: Optional scheduler hints to pass to nova
default: {}
type: json
description: Optional scheduler hints to pass to nova
default: {}
@@
-99,13
+93,23
@@
parameters:
ServiceConfigSettings:
type: json
default: {}
ServiceConfigSettings:
type: json
default: {}
+ ServiceNames:
+ type: comma_delimited_list
+ default: []
+ ConfigCommand:
+ type: string
+ description: Command which will be run whenever configuration data changes
+ default: os-refresh-config --timeout 14400
resources:
BlockStorage:
resources:
BlockStorage:
- type: OS::Nova::Server
+ type: OS::TripleO::Server
+ metadata:
+ os-collect-config:
+ command: {get_param: ConfigCommand}
properties:
image:
properties:
image:
- {get_param: Image}
+ {get_param:
BlockStorage
Image}
flavor: {get_param: Flavor}
key_name: {get_param: KeyName}
networks:
flavor: {get_param: Flavor}
key_name: {get_param: KeyName}
networks:
@@
-118,7
+122,7
@@
resources:
params: {get_param: HostnameMap}
software_config_transport: {get_param: SoftwareConfigTransport}
metadata: {get_param: ServerMetadata}
params: {get_param: HostnameMap}
software_config_transport: {get_param: SoftwareConfigTransport}
metadata: {get_param: ServerMetadata}
- scheduler_hints: {get_param: SchedulerHints}
+ scheduler_hints: {get_param:
BlockStorage
SchedulerHints}
# Combine the NodeAdminUserData and NodeUserData mime archives
UserData:
# Combine the NodeAdminUserData and NodeUserData mime archives
UserData:
@@
-239,8
+243,6
@@
resources:
template: "'IP'"
params:
IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
template: "'IP'"
params:
IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
- ntp_servers: {get_param: NtpServer}
- timezone: {get_param: TimeZone}
enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
enable_package_install: {get_param: EnablePackageInstall}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
@@
-256,18
+258,19
@@
resources:
- heat_config_%{::deploy_config_name}
- volume_extraconfig
- extraconfig
- heat_config_%{::deploy_config_name}
- volume_extraconfig
- extraconfig
+ - service_names
- service_configs
- volume
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- service_configs
- volume
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- - common
- network
merge_behavior: deeper
datafiles:
- network
merge_behavior: deeper
datafiles:
+ service_names:
+ mapped_data:
+ service_names: {get_param: ServiceNames}
service_configs:
mapped_data: {get_param: ServiceConfigSettings}
service_configs:
mapped_data: {get_param: ServiceConfigSettings}
- common:
- raw_data: {get_file: hieradata/common.yaml}
network:
mapped_data:
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
network:
mapped_data:
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
@@
-282,8
+285,6
@@
resources:
mapped_data:
# Cinder
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
mapped_data:
# Cinder
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
- ntp::servers: {get_input: ntp_servers}
- timezone::timezone: {get_input: timezone}
tripleo::packages::enable_install: {get_input: enable_package_install}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
tripleo::packages::enable_install: {get_input: enable_package_install}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
@@
-318,6
+319,12
@@
resources:
get_param: UpdateIdentifier
outputs:
get_param: UpdateIdentifier
outputs:
+ ip_address:
+ description: IP address of the server in the ctlplane network
+ value: {get_attr: [BlockStorage, networks, ctlplane, 0]}
+ hostname:
+ description: Hostname of the server
+ value: {get_attr: [BlockStorage, name]}
hosts_entry:
value:
str_replace:
hosts_entry:
value:
str_replace:
@@
-391,11
+398,3
@@
outputs:
management_ip_address:
description: IP address of the server in the management network
value: {get_attr: [ManagementPort, ip_address]}
management_ip_address:
description: IP address of the server in the management network
value: {get_attr: [ManagementPort, ip_address]}
- config_identifier:
- description: identifier which changes if the node configuration may need re-applying
- value:
- list_join:
- - ''
- - - {get_attr: [BlockStorageDeployment, deploy_stdout]}
- - {get_attr: [NodeTLSCAData, deploy_stdout]}
- - {get_param: UpdateIdentifier}