From 46de9fb4fe6a21b845a006dc01ec9c5e3e6972ee Mon Sep 17 00:00:00 2001
From: David J Peacock <david.j.peacock@gmail.com>
Date: Wed, 18 Sep 2019 14:57:28 -0400
Subject: [PATCH] Correct availability_zone to be non-mandatory in heat

As per CLI and GUI, availability_zone is not mandatory.  In templates,
it is.  This is incorrect.

This patch corrects behaviour to match CLI and GUI.

Change-Id: Ice37340f084ea65bd4b46562145e82ede6bc0df5
Story: 2006586
(cherry picked from commit 2799a5fcd76639a202092ea1b6fc242a8886dc56)
---
 heat/engine/resources/openstack/nova/host_aggregate.py    | 1 -
 ...ability-zone-to-be-non-mandatory-069d95042f5ed84f.yaml | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/correct-availability-zone-to-be-non-mandatory-069d95042f5ed84f.yaml

diff --git a/heat/engine/resources/openstack/nova/host_aggregate.py b/heat/engine/resources/openstack/nova/host_aggregate.py
index 2b6f0ce81b..ee57fe27bb 100644
--- a/heat/engine/resources/openstack/nova/host_aggregate.py
+++ b/heat/engine/resources/openstack/nova/host_aggregate.py
@@ -56,7 +56,6 @@ class HostAggregate(resource.Resource):
         AVAILABILITY_ZONE: properties.Schema(
             properties.Schema.STRING,
             _('Name for the availability zone.'),
-            required=True,
             update_allowed=True,
         ),
         HOSTS: properties.Schema(
diff --git a/releasenotes/notes/correct-availability-zone-to-be-non-mandatory-069d95042f5ed84f.yaml b/releasenotes/notes/correct-availability-zone-to-be-non-mandatory-069d95042f5ed84f.yaml
new file mode 100644
index 0000000000..9e0716e90a
--- /dev/null
+++ b/releasenotes/notes/correct-availability-zone-to-be-non-mandatory-069d95042f5ed84f.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Erroneously, availability_zone for host aggregate resource types was
+    considered mandatory in heat templates.
+
+    Behaviour has been adjusted to bring this in line with the CLI and GUI, in
+    which it is optional.