Add environments dcn.yaml and dcn-hci.yaml.

Adds 2 new DCN related environments created using the
sample-env-generator.

Also updates a comment for the NovaComputeAvailabilityZone parameter in
deployment/nova/nova-az-config.yaml.

Change-Id: Iad5c932a1f469130bcf9d82277eac4fcf7ecda75
This commit is contained in:
James Slagle 2019-10-08 18:06:21 -04:00
parent 9b719f3608
commit 19e1df6d3b
5 changed files with 93 additions and 0 deletions

View File

@ -37,6 +37,7 @@ parameters:
NovaComputeAvailabilityZone:
description: 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.
default: ""
type: string
RootStackName:

33
environments/dcn-hci.yaml Normal file
View File

@ -0,0 +1,33 @@
# *******************************************************************
# This file was created automatically by the sample environment
# generator. Developers should use `tox -e genconfig` to update it.
# Users are recommended to make changes to a copy of the file instead
# of the original, if any customizations are needed.
# *******************************************************************
# title: Distributed Compute Node HCI
# description: |
# Environment file for deploying a remote site of HCI distributed compute
# nodes (DCN) in a separate stack (multi-stack) deployment. It should be
# used in combination with environments/ceph-ansible/ceph-ansible.yaml.
parameter_defaults:
# When running Cinder A/A, whether to connect to Etcd via the local IP for the Etcd network. If set to true, the ip on the local node will be used. If set to false, the VIP on the Etcd network will be used instead. Defaults to false.
# Type: boolean
CinderEtcdLocalConnect: True
# The Cinder service's storage availability zone.
# Type: string
CinderStorageAvailabilityZone: dcn
# The cluster name used for deploying the cinder-volume service in an active-active (A/A) configuration. This configuration requires the Cinder backend drivers support A/A, and the cinder-volume service not be managed by pacemaker. If these criteria are not met then the cluster name must be left blank.
# Type: string
CinderVolumeCluster: dcn
# 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::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
OS::TripleO::Services::NovaAZConfig: ../deployment/nova/nova-az-config.yaml

18
environments/dcn.yaml Normal file
View File

@ -0,0 +1,18 @@
# *******************************************************************
# This file was created automatically by the sample environment
# generator. Developers should use `tox -e genconfig` to update it.
# Users are recommended to make changes to a copy of the file instead
# of the original, if any customizations are needed.
# *******************************************************************
# title: Distributed Compute Node
# description: |
# Environment file for deploying a remote site of distributed compute nodes
# (DCN) in a separate stack (multi-stack) deployment.
parameter_defaults:
# 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::RedisVipPort: ../network/ports/noop.yaml
OS::TripleO::Services::NovaAZConfig: ../deployment/nova/nova-az-config.yaml

View File

@ -0,0 +1,4 @@
---
features:
- Environment files for distributed compute node (DCN) deployments have been
added at environments/dcn.yaml and environments/dcn-hci.yaml.

View File

@ -0,0 +1,37 @@
environments:
- name: dcn
title: Distributed Compute Node
description: |-
Environment file for deploying a remote site of distributed compute nodes
(DCN) in a separate stack (multi-stack) deployment.
files: &dcn_files
deployment/nova/nova-az-config.yaml:
parameters:
- NovaComputeAvailabilityZone
resource_registry: &dcn_resource_registry
OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
OS::TripleO::Services::NovaAZConfig: ../deployment/nova/nova-az-config.yaml
children:
- name: dcn-hci
title: Distributed Compute Node HCI
description: |-
Environment file for deploying a remote site of HCI distributed compute
nodes (DCN) in a separate stack (multi-stack) deployment. It should be
used in combination with environments/ceph-ansible/ceph-ansible.yaml.
files:
<<: *dcn_files
deployment/cinder/cinder-base.yaml:
parameters:
- CinderStorageAvailabilityZone
deployment/cinder/cinder-volume-container-puppet.yaml:
parameters:
- CinderVolumeCluster
- CinderEtcdLocalConnect
sample_values:
CinderStorageAvailabilityZone: dcn
CinderVolumeCluster: dcn
CinderEtcdLocalConnect: True
resource_registry:
<<: *dcn_resource_registry
OS::TripleO::Services::Etcd: ../../deployment/etcd/etcd-container-puppet.yaml
OS::TripleO::Services::CinderVolume: ../deployment/cinder/cinder-volume-container-puppet.yaml