openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Updates for dcn/dcn-hci sample envs"

Browse Source
This commit is contained in:
Zuul 2019-11-12 16:22:48 +00:00 committed by Gerrit Code Review
commit 9cde859656
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
environments/dcn-hci.yaml
View File

@ -22,11 +22,16 @@ parameter_defaults:
# Type: string
CinderVolumeCluster: dcn
# Manage the network and related resources (subnets and segments) with either create, update, or delete operations (depending on the stack operation). Does not apply to ports which will always be managed as needed. Defaults to true. For multi-stack use cases where the network related resources have already been managed by a separate stack, this parameter can be set to false.
# Type: boolean
ManageNetworks: False
# The availability zone where new Nova compute nodes will be added. If the zone does not already exist, it will be created. If left unset, it will default to the value of the stack name.
# Type: string
NovaComputeAvailabilityZone: ''
resource_registry:
OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
OS::TripleO::Services::CinderVolume: ../deployment/cinder/cinder-volume-container-puppet.yaml
OS::TripleO::Services::Etcd: ../../deployment/etcd/etcd-container-puppet.yaml

5
environments/dcn.yaml
View File

@ -9,10 +9,15 @@
# Environment file for deploying a remote site of distributed compute nodes
# (DCN) in a separate stack (multi-stack) deployment.
parameter_defaults:
# Manage the network and related resources (subnets and segments) with either create, update, or delete operations (depending on the stack operation). Does not apply to ports which will always be managed as needed. Defaults to true. For multi-stack use cases where the network related resources have already been managed by a separate stack, this parameter can be set to false.
# Type: boolean
ManageNetworks: False
# The availability zone where new Nova compute nodes will be added. If the zone does not already exist, it will be created. If left unset, it will default to the value of the stack name.
# Type: string
NovaComputeAvailabilityZone: ''
resource_registry:
OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
OS::TripleO::Services::NovaAZConfig: ../deployment/nova/nova-az-config.yaml

7
sample-env-generator/dcn.yaml
View File

@ -8,8 +8,14 @@ environments:
deployment/nova/nova-az-config.yaml:
parameters:
- NovaComputeAvailabilityZone
network/external.yaml:
parameters:
- ManageNetworks
sample_values: &sample_values
ManageNetworks: false
resource_registry: &dcn_resource_registry
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml
OS::TripleO::Services::NovaAZConfig: ../deployment/nova/nova-az-config.yaml
children:
- name: dcn-hci
@ -28,6 +34,7 @@ environments:
- CinderVolumeCluster
- CinderEtcdLocalConnect
sample_values:
<<: *sample_values
CinderStorageAvailabilityZone: dcn
CinderVolumeCluster: dcn
CinderEtcdLocalConnect: True