Merge "Wire in NodeExtraConfig interface"
This commit is contained in:
commit
2657c78dc4
|
@ -30,11 +30,13 @@ resource_registry:
|
|||
# Hooks for operator extra config
|
||||
# NodeUserData == Cloud-init additional user-data, e.g cloud-config
|
||||
# ControllerExtraConfigPre == Controller configuration pre service deployment
|
||||
# NodeExtraConfig == All nodes configuration pre service deployment
|
||||
# NodeExtraConfigPost == All nodes configuration post service deployment
|
||||
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
|
||||
OS::TripleO::ControllerExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
||||
OS::TripleO::ComputeExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
||||
OS::TripleO::CephStorageExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
||||
OS::TripleO::NodeExtraConfig: puppet/extraconfig/pre_deploy/default.yaml
|
||||
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
|
||||
|
||||
# "AllNodes" Extra cluster config, runs on all nodes prior to the post_deploy
|
||||
|
|
|
@ -181,6 +181,14 @@ resources:
|
|||
properties:
|
||||
server: {get_resource: CephStorage}
|
||||
|
||||
# Hook for site-specific additional pre-deployment config,
|
||||
# applying to all nodes, e.g node registration/unregistration
|
||||
NodeExtraConfig:
|
||||
depends_on: CephStorageExtraConfigPre
|
||||
type: OS::TripleO::NodeExtraConfig
|
||||
properties:
|
||||
server: {get_resource: CephStorage}
|
||||
|
||||
UpdateConfig:
|
||||
type: OS::TripleO::Tasks::PackageUpdate
|
||||
|
||||
|
|
|
@ -263,6 +263,14 @@ resources:
|
|||
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
|
||||
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
|
||||
|
||||
# Hook for site-specific additional pre-deployment config,
|
||||
# applying to all nodes, e.g node registration/unregistration
|
||||
NodeExtraConfig:
|
||||
depends_on: BlockStorageDeployment
|
||||
type: OS::TripleO::NodeExtraConfig
|
||||
properties:
|
||||
server: {get_resource: BlockStorage}
|
||||
|
||||
UpdateConfig:
|
||||
type: OS::TripleO::Tasks::PackageUpdate
|
||||
|
||||
|
|
|
@ -555,6 +555,14 @@ resources:
|
|||
properties:
|
||||
server: {get_resource: NovaCompute}
|
||||
|
||||
# Hook for site-specific additional pre-deployment config,
|
||||
# applying to all nodes, e.g node registration/unregistration
|
||||
NodeExtraConfig:
|
||||
depends_on: ComputeExtraConfigPre
|
||||
type: OS::TripleO::NodeExtraConfig
|
||||
properties:
|
||||
server: {get_resource: NovaCompute}
|
||||
|
||||
UpdateConfig:
|
||||
type: OS::TripleO::Tasks::PackageUpdate
|
||||
|
||||
|
|
|
@ -1211,6 +1211,14 @@ resources:
|
|||
properties:
|
||||
server: {get_resource: Controller}
|
||||
|
||||
# Hook for site-specific additional pre-deployment config,
|
||||
# applying to all nodes, e.g node registration/unregistration
|
||||
NodeExtraConfig:
|
||||
depends_on: ControllerExtraConfigPre
|
||||
type: OS::TripleO::NodeExtraConfig
|
||||
properties:
|
||||
server: {get_resource: Controller}
|
||||
|
||||
UpdateConfig:
|
||||
type: OS::TripleO::Tasks::PackageUpdate
|
||||
|
||||
|
|
|
@ -216,6 +216,14 @@ resources:
|
|||
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
||||
swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
|
||||
|
||||
# Hook for site-specific additional pre-deployment config,
|
||||
# applying to all nodes, e.g node registration/unregistration
|
||||
NodeExtraConfig:
|
||||
depends_on: SwiftStorageHieraDeploy
|
||||
type: OS::TripleO::NodeExtraConfig
|
||||
properties:
|
||||
server: {get_resource: SwiftStorage}
|
||||
|
||||
UpdateConfig:
|
||||
type: OS::TripleO::Tasks::PackageUpdate
|
||||
|
||||
|
|
Loading…
Reference in New Issue