Merge "Add NovaCrossAZAttach parameter"

deployment/nova/nova-base-puppet.yaml

@@ -242,6 +242,11 @@ parameters:
     default: false
     description: Whether this is an cell additional to the default cell.
     type: boolean
+  NovaCrossAZAttach:
+    default: true
+    description:
+      Whether instances can attach cinder volumes from a different availability zone.
+    type: boolean
 
 conditions:
 
@@ -400,6 +405,7 @@ outputs:
           nova::cron::purge_shadow_tables::all_cells: {get_param: NovaCronPurgeShadowTablesAllCells}
           nova::compute::sync_power_state_interval: {get_param: NovaSyncPowerStateInterval}
           nova_is_additional_cell: {get_param: NovaAdditionalCell}
+          nova:cross_az_attach: {get_param: NovaCrossAZAttach}
         - get_attr: [RoleParametersValue, value]
         -
           if:

environments/dcn-hci.yaml

@@ -38,6 +38,10 @@ parameter_defaults:
   # Type: string
   NovaComputeAvailabilityZone: ''
 
+  # Whether instances can attach cinder volumes from a different availability zone.
+  # Type: boolean
+  NovaCrossAZAttach: False
+
 resource_registry:
   OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml
   OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml

environments/dcn.yaml

@@ -25,6 +25,10 @@ parameter_defaults:
   # Type: string
   NovaComputeAvailabilityZone: ''
 
+  # Whether instances can attach cinder volumes from a different availability zone.
+  # Type: boolean
+  NovaCrossAZAttach: False
+
 resource_registry:
   OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml
   OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml

sample-env-generator/dcn.yaml

@@ -15,8 +15,12 @@ environments:
       network/external.yaml:
         parameters:
           - ManageNetworks
+      deployment/nova/nova-base-puppet.yaml:
+        parameters:
+          - NovaCrossAZAttach
     sample_values: &sample_values
       ManageNetworks: false
+      NovaCrossAZAttach: false
     resource_registry: &dcn_resource_registry
       OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
       OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml