Merge "Adding ability to set default_availability_zone for nova controller." into release/2019.2.0
diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index 67c8230..b928d85 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -80,7 +80,7 @@
# * 'nova' is the default value
#
# (string value)
-#default_availability_zone=nova
+default_availability_zone = {{ compute.availability_zone|default('nova') }}
# Length of generated instance admin passwords. (integer value)
# Minimum value: 0
diff --git a/nova/files/ocata/nova-controller.conf.Debian b/nova/files/ocata/nova-controller.conf.Debian
index afb8d02..7435861 100644
--- a/nova/files/ocata/nova-controller.conf.Debian
+++ b/nova/files/ocata/nova-controller.conf.Debian
@@ -76,7 +76,7 @@
# * 'nova' is the default value
#
# (string value)
-#default_availability_zone=nova
+default_availability_zone = {{ controller.availability_zone|default('nova') }}
# Length of generated instance admin passwords. (integer value)
# Minimum value: 0
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index e2207db..fcc52ab 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -81,7 +81,7 @@
# * 'nova' is the default value
#
# (string value)
-#default_availability_zone=nova
+default_availability_zone = {{ compute.availability_zone|default('nova') }}
# Length of generated instance admin passwords. (integer value)
# Minimum value: 0
diff --git a/nova/files/pike/nova-controller.conf.Debian b/nova/files/pike/nova-controller.conf.Debian
index c3a6d5b..ddd9db2 100644
--- a/nova/files/pike/nova-controller.conf.Debian
+++ b/nova/files/pike/nova-controller.conf.Debian
@@ -83,7 +83,7 @@
# * 'nova' is the default value
#
# (string value)
-#default_availability_zone=nova
+default_availability_zone = {{ controller.availability_zone|default('nova') }}
# Length of generated instance admin passwords. (integer value)
# Minimum value: 0
diff --git a/nova/files/queens/nova-compute.conf.Debian b/nova/files/queens/nova-compute.conf.Debian
index 874500d..a3a7700 100644
--- a/nova/files/queens/nova-compute.conf.Debian
+++ b/nova/files/queens/nova-compute.conf.Debian
@@ -36,7 +36,7 @@
#
# * Any string representing an existing availability zone name.
# (string value)
-#default_availability_zone = nova
+default_availability_zone = {{ compute.availability_zone|default('nova') }}
#
# Default availability zone for instances.
diff --git a/nova/files/queens/nova-controller.conf.Debian b/nova/files/queens/nova-controller.conf.Debian
index 317b610..d9dcf76 100644
--- a/nova/files/queens/nova-controller.conf.Debian
+++ b/nova/files/queens/nova-controller.conf.Debian
@@ -36,7 +36,7 @@
#
# * Any string representing an existing availability zone name.
# (string value)
-#default_availability_zone = nova
+default_availability_zone = {{ controller.availability_zone|default('nova') }}
#
# Default availability zone for instances.