diff --git a/environments/dcn-hci.yaml b/environments/dcn-hci.yaml index 18c3be3252..3395b314a7 100644 --- a/environments/dcn-hci.yaml +++ b/environments/dcn-hci.yaml @@ -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 diff --git a/environments/dcn.yaml b/environments/dcn.yaml index 4f2d411373..8ec2b02798 100644 --- a/environments/dcn.yaml +++ b/environments/dcn.yaml @@ -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 diff --git a/sample-env-generator/dcn.yaml b/sample-env-generator/dcn.yaml index 4fb0c37d67..d1d0ee835f 100644 --- a/sample-env-generator/dcn.yaml +++ b/sample-env-generator/dcn.yaml @@ -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