c5d10cd9fc
The new hiera hook in I21639f6aadabf9e49f40d1bb0b1d0edcfc4dbc5e was added to most of the tripleo-heat-templates in Ibe7e2044e200e2c947223286fdf4fd5bcf98c2e1 The new hook is installed by default if you use tripleo-common Ia1864933235152b7e899c4442534879f8e22240d and will be installed as part of the Newton to Ocata upgrades workflow in I0c7a32194c0069b63a501a913c17907b47c9cc16 In order to use the new hiera data as part of the upgrade we need to remove the old hieradata which will break anyone still defining and using it. This change updates the remaining vendor plugin manifests to use the new hiera hook. The pre-requisite is that the new hook is installed on their overcloud (as above it comes if you follow the N..O upgrade) Change-Id: Ic95154734cb21e6b941c7f1569295b413963831d
93 lines
3.5 KiB
YAML
93 lines
3.5 KiB
YAML
heat_template_version: ocata
|
|
|
|
description: Configure hieradata for Nuage configuration on the Compute
|
|
|
|
parameters:
|
|
server:
|
|
description: ID of the compute node to apply this config to
|
|
type: string
|
|
|
|
NuageActiveController:
|
|
description: IP address of the Active Virtualized Services Controller (VSC)
|
|
type: string
|
|
NuageStandbyController:
|
|
description: IP address of the Standby Virtualized Services Controller (VSC)
|
|
type: string
|
|
NuageMetadataPort:
|
|
description: TCP Port to listen for metadata server requests
|
|
type: string
|
|
default: '9697'
|
|
NuageNovaMetadataPort:
|
|
description: TCP Port used by Nova metadata server
|
|
type: string
|
|
default: '8775'
|
|
NuageMetadataProxySharedSecret:
|
|
description: Shared secret to sign the instance-id request
|
|
type: string
|
|
NuageNovaClientVersion:
|
|
description: Client Version Nova
|
|
type: string
|
|
default: '2'
|
|
NuageNovaOsUsername:
|
|
description: Nova username in keystone_authtoken
|
|
type: string
|
|
default: 'nova'
|
|
NuageMetadataAgentStartWithOvs:
|
|
description: Set to True if nuage-metadata-agent needs to be started with nuage-openvswitch-switch
|
|
type: string
|
|
default: 'True'
|
|
NuageNovaApiEndpoint:
|
|
description: One of publicURL, internalURL, adminURL in "keystone endpoint-list"
|
|
type: string
|
|
default: 'publicURL'
|
|
NuageNovaRegionName:
|
|
description: Region name in "keystone endpoint-list"
|
|
type: string
|
|
default: 'regionOne'
|
|
|
|
# Declaration of resources for the template.
|
|
resources:
|
|
NovaNuageConfig:
|
|
type: OS::Heat::StructuredConfig
|
|
properties:
|
|
group: hiera
|
|
config:
|
|
datafiles:
|
|
nova_nuage_data:
|
|
mapped_data:
|
|
nuage::vrs::active_controller: {get_input: ActiveController}
|
|
nuage::vrs::standby_controller: {get_input: StandbyController}
|
|
nuage::metadataagent::metadata_port: {get_input: MetadataPort}
|
|
nuage::metadataagent::nova_metadata_port: {get_input: NovaMetadataPort}
|
|
nuage::metadataagent::metadata_secret: {get_input: SharedSecret}
|
|
nuage::metadataagent::nova_client_version: {get_input: NovaClientVersion}
|
|
nuage::metadataagent::nova_os_username: {get_input: NovaOsUsername}
|
|
nuage::metadataagent::metadata_agent_start_with_ovs: {get_input: MetadataAgentStartWithOvs}
|
|
nuage::metadataagent::nova_api_endpoint_type: {get_input: NovaApiEndpointType}
|
|
nuage::metadataagent::nova_region_name: {get_input: NovaRegionName}
|
|
|
|
NovaNuageDeployment:
|
|
type: OS::Heat::StructuredDeployment
|
|
properties:
|
|
name: NovaNuageDeployment
|
|
config: {get_resource: NovaNuageConfig}
|
|
server: {get_param: server}
|
|
input_values:
|
|
ActiveController: {get_param: NuageActiveController}
|
|
StandbyController: {get_param: NuageStandbyController}
|
|
MetadataPort: {get_param: NuageMetadataPort}
|
|
NovaMetadataPort: {get_param: NuageNovaMetadataPort}
|
|
SharedSecret: {get_param: NuageMetadataProxySharedSecret}
|
|
NovaClientVersion: {get_param: NuageNovaClientVersion}
|
|
NovaOsUsername: {get_param: NuageNovaOsUsername}
|
|
MetadataAgentStartWithOvs: {get_param: NuageMetadataAgentStartWithOvs}
|
|
NovaApiEndpointType: {get_param: NuageNovaApiEndpoint}
|
|
NovaRegionName: {get_param: NuageNovaRegionName}
|
|
|
|
# Specify output parameters that will be available
|
|
# after the template is instantiated.
|
|
outputs:
|
|
deploy_stdout:
|
|
description: Deployment reference, used to trigger puppet apply on changes
|
|
value: {get_attr: [NovaNuageDeployment, deploy_stdout]}
|