Merge ~freyes/ubuntu/+source/heat:stable/xena into ~ubuntu-openstack-dev/ubuntu/+source/heat:stable/xena

[Felipe Reyes]

diff --git a/AUTHORS b/AUTHORS
index 4f34a6b..f8705d9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -49,6 +49,7 @@ Atsushi Sasaki <[e-mail]>
 Attila Fazekas <[e-mail]>
 AvnishPal <[e-mail]>
 BK Box <[e-mail]>
+Balazs Gibizer <[e-mail]>
 Bartosz Górski <[e-mail]>
 Ben Nemec <[e-mail]>
 Ben Nemec <[e-mail]>
diff --git a/ChangeLog b/ChangeLog
index 3720f19..a35becd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 CHANGES
 =======
 
+17.0.1
+------
+
+* Provide install\_command to pip install with upper-constraints
+* Fix timeout calc of nested resource groups
+* Reproduce bug story/2009237
+* Fallback to upstream for Fedora image
+* Fix ServerGroup create
+
 17.0.0
 ------
 
diff --git a/PKG-INFO b/PKG-INFO
index 7ef1230..315b8c6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: openstack-heat
-Version: 17.0.0
+Version: 17.0.1
 Summary: OpenStack Orchestration
 Home-page: https://docs.openstack.org/heat/latest/
 Author: OpenStack
diff --git a/debian/changelog b/debian/changelog
index 41503e0..f83520d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-heat (1:17.0.0-0ubuntu1.1) UNRELEASED; urgency=medium
+heat (1:17.0.1-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Corey Bryant ]
   * d/gbp.conf: Create stable/xena branch.
 
- -- Corey Bryant <[e-mail]>  Fri, 15 Oct 2021 14:53:00 -0400
+  [ Felipe Reyes ]
+  * New stable point release for OpenStack Xena (LP: #1962582).
+
+ -- Felipe Reyes <[e-mail]>  Tue, 01 Mar 2022 14:51:07 +0000
 
 heat (1:17.0.0-0ubuntu1) impish; urgency=medium
 
diff --git a/devstack/lib/heat b/devstack/lib/heat
index 5993d7d..5f5f172 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -471,10 +471,19 @@ function configure_tempest_for_heat {
     source $TOP_DIR/openrc admin admin
     iniset $TEMPEST_CONFIG heat_plugin admin_username $OS_USERNAME
     iniset $TEMPEST_CONFIG heat_plugin admin_password $OS_PASSWORD
+
+    # NOTE(ianw) OpenDev infra only keeps the latest two Fedora's
+    # around; prefer the mirror but allow fallback
     if [[ -e /etc/ci/mirror_info.sh ]]; then
         source /etc/ci/mirror_info.sh
     fi
-    export HEAT_TEST_FEDORA_IMAGE=${NODEPOOL_FEDORA_MIRROR:-https://download.fedoraproject.org/pub/fedora/linux}/releases/33/Cloud/x86_64/images/Fedora-Cloud-Base-33-1.2.x86_64.qcow2
+    HEAT_TEST_FEDORA_IMAGE_UPSTREAM=https://download.fedoraproject.org/pub/fedora/linux
+    HEAT_TEST_FEDORA_IMAGE_PATH=releases/33/Cloud/x86_64/images/Fedora-Cloud-Base-33-1.2.x86_64.qcow2
+    if curl --output /dev/null --silent --head --fail "${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}"; then
+        export HEAT_TEST_FEDORA_IMAGE="${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}"
+    else
+        export HEAT_TEST_FEDORA_IMAGE="${HEAT_TEST_FEDORA_IMAGE_UPSTREAM}/${HEAT_TEST_FEDORA_IMAGE_PATH}"
+    fi
     TOKEN=$(openstack token issue -c id -f value)
     local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-33-1.2.x86_64" )
     if [[ -z $image_exists ]]; then
diff --git a/heat/engine/resources/openstack/heat/resource_group.py b/heat/engine/resources/openstack/heat/resource_group.py
index 48ef05a..1bdc0c3 100644
--- a/heat/engine/resources/openstack/heat/resource_group.py
+++ b/heat/engine/resources/openstack/heat/resource_group.py
@@ -15,6 +15,7 @@ import collections
 import copy
 import functools
 import itertools
+import math
 
 from oslo_log import log as logging
 
@@ -433,18 +434,18 @@ class ResourceGroup(stack_resource.StackResource):
                 return False
         return True
 
-    def _run_to_completion(self, template, timeout):
+    def _run_to_completion(self, template, timeout_mins):
         updater = self.update_with_template(template, {},
-                                            timeout)
+                                            timeout_mins)
 
         while not super(ResourceGroup,
                         self).check_update_complete(updater):
             yield
 
-    def _run_update(self, total_capacity, max_updates, timeout):
+    def _run_update(self, total_capacity, max_updates, timeout_mins):
         template = self._assemble_for_rolling_update(total_capacity,
                                                      max_updates)
-        return self._run_to_completion(template, timeout)
+        return self._run_to_completion(template, timeout_mins)
 
     def check_update_complete(self, checkers):
         for checker in checkers:
@@ -776,13 +777,18 @@ class ResourceGroup(stack_resource.StackResource):
 
         batches = list(self._get_batches(self.get_size(), curr_cap, batch_size,
                                          min_in_service))
-        update_timeout = self._update_timeout(len(batches), pause_sec)
+        update_timeout_secs = self._update_timeout(len(batches), pause_sec)
+
+        # NOTE(gibi) update_timeout is in seconds but the _run_update
+        # eventually calls StackResource.update_with_template that takes
+        # timeout in minutes so we need to convert here.
+        update_timeout_mins = math.ceil(update_timeout_secs / 60)
 
         def tasks():
             for index, (curr_cap, max_upd) in enumerate(batches):
                 yield scheduler.TaskRunner(self._run_update,
                                            curr_cap, max_upd,
-                                           update_timeout)
+                                           update_timeout_mins)
 
                 if index < (len(batches) - 1) and pause_sec > 0:
                     yield scheduler.TaskRunner(pause_between_batch, pause_sec)
diff --git a/heat/engine/resources/openstack/nova/server_group.py b/heat/engine/resources/openstack/nova/server_group.py
index afc417b..b4eb956 100644
--- a/heat/engine/resources/openstack/nova/server_group.py
+++ b/heat/engine/resources/openstack/nova/server_group.py
@@ -35,11 +35,13 @@ class ServerGroup(resource.Resource):
     entity = 'server_groups'
 
     PROPERTIES = (
-        NAME, POLICIES, RULE
+        NAME, POLICIES, RULES
     ) = (
-        'name', 'policies', 'rule'
+        'name', 'policies', 'rules'
     )
 
+    _RULES = (MAX_SERVER_PER_HOST) = ('max_server_per_host')
+
     properties_schema = {
         NAME: properties.Schema(
             properties.Schema.STRING,
@@ -47,7 +49,7 @@ class ServerGroup(resource.Resource):
         ),
         POLICIES: properties.Schema(
             properties.Schema.LIST,
-            _('A list of string policies to apply. '
+            _('A list of exactly one policy to apply. '
               'Defaults to anti-affinity.'),
             default=['anti-affinity'],
             constraints=[
@@ -59,11 +61,17 @@ class ServerGroup(resource.Resource):
                 properties.Schema.STRING,
             ),
         ),
-        RULE: properties.Schema(
+        RULES: properties.Schema(
             properties.Schema.MAP,
-            _('A rule for the policy. Currently, only the '
-              '"max_server_per_host" rule is supported for the '
-              '"anti-affinity" policy.'),
+            _('Rules for a policy.'),
+            schema={
+                MAX_SERVER_PER_HOST: properties.Schema(
+                    properties.Schema.NUMBER,
+                    _('Maximum servers in a group on a given host. '
+                      'Rule for anti-affinity policy.')
+                )
+            },
+            support_status=support.SupportStatus(version='17.0.0'),
         ),
     }
 
@@ -77,26 +85,25 @@ class ServerGroup(resource.Resource):
             msg = _('Required microversion for soft policies not supported.')
             raise exception.StackValidationFailed(message=msg)
 
-        if self.properties[self.RULE]:
+        if self.properties[self.RULES]:
             is_supported = self.client_plugin().is_version_supported(
                 MICROVERSION_RULE)
             if not is_supported:
-                msg = _('Required microversion for rule not supported.')
+                msg = _('Required microversion for rules not supported.')
                 raise exception.StackValidationFailed(message=msg)
 
     def handle_create(self):
         name = self.physical_resource_name()
         policies = self.properties[self.POLICIES]
-        if self.properties[self.RULE] and 'soft-affinity' in policies:
-            rule = self.properties[self.RULE]
-            client = self.client()
-            server_group = client.server_groups.create(name=name,
-                                                       policies=policies,
-                                                       rule=rule)
+        rules = self.properties[self.RULES]
+        rules_supported = self.client_plugin().is_version_supported(
+            MICROVERSION_RULE)
+        if rules_supported:
+            server_group = self.client().server_groups.create(
+                name=name, policy=policies[0], rules=rules)
         else:
-            client = self.client()
-            server_group = client.server_groups.create(name=name,
-                                                       policies=policies)
+            server_group = self.client().server_groups.create(
+                name=name, policies=policies)
         self.resource_id_set(server_group.id)
 
     def physical_resource_name(self):
diff --git a/heat/tests/openstack/nova/test_server_group.py b/heat/tests/openstack/nova/test_server_group.py
index 0a1e682..c2dfda4 100644
--- a/heat/tests/openstack/nova/test_server_group.py
+++ b/heat/tests/openstack/nova/test_server_group.py
@@ -26,7 +26,9 @@ sg_template = {
             "type": "OS::Nova::ServerGroup",
             "properties": {
                 "name": "test",
-                "policies": ["anti-affinity"]
+                "policies": ["anti-affinity"],
+                "rules": {
+                    "max_server_per_host": 8}
             }
         }
     }
@@ -50,6 +52,12 @@ class NovaServerGroupTest(common.HeatTestCase):
         # create mock clients and objects
         nova = mock.MagicMock()
         self.sg.client = mock.MagicMock(return_value=nova)
+        mock_plugin = mock.MagicMock()
+        self.patchobject(mock_plugin,
+                         'is_version_supported',
+                         return_value=True)
+        self.patchobject(self.sg, 'client_plugin',
+                         return_value=mock_plugin)
         self.sg_mgr = nova.server_groups
 
     def _create_sg(self, name):
@@ -68,7 +76,7 @@ class NovaServerGroupTest(common.HeatTestCase):
             name = 'test'
             n = name
 
-            def fake_create(name, policies):
+            def fake_create(name, policy, rules):
                 self.assertGreater(len(name), 1)
                 return FakeGroup(n)
             self.sg_mgr.create = fake_create
@@ -81,7 +89,9 @@ class NovaServerGroupTest(common.HeatTestCase):
         self._create_sg('test')
         expected_args = ()
         expected_kwargs = {'name': 'test',
-                           'policies': ["anti-affinity"],
+                           'policy': "anti-affinity",
+                           'rules': {
+                               'max_server_per_host': 8}
                            }
         self.sg_mgr.create.assert_called_once_with(*expected_args,
                                                    **expected_kwargs)
diff --git a/heat_integrationtests/functional/test_resource_group.py b/heat_integrationtests/functional/test_resource_group.py
index ebce70d..07be7f2 100644
--- a/heat_integrationtests/functional/test_resource_group.py
+++ b/heat_integrationtests/functional/test_resource_group.py
@@ -129,6 +129,60 @@ resources:
         outputs.append(validate_output(stack, 'random2', 30))
         self.assertEqual(outputs, self._stack_output(stack, 'all_values'))
 
+    def test_create_nested_groups_with_timeout(self):
+        parent_template = '''
+heat_template_version: rocky
+resources:
+  parent_group:
+    type: OS::Heat::ResourceGroup
+    update_policy:
+      batch_create: { max_batch_size: 1, pause_time: 1 }
+    properties:
+      count: 2
+      resource_def:
+        type: child.yaml
+'''
+        child_template = '''
+heat_template_version: rocky
+resources:
+  child_group:
+    type: OS::Heat::ResourceGroup
+    update_policy:
+      batch_create: { max_batch_size: 1, pause_time: 1 }
+    properties:
+      count: 2
+      resource_def:
+        type: value.yaml
+'''
+        value_template = '''
+heat_template_version: rocky
+resources:
+  value:
+    type: OS::Heat::Value
+    properties:
+      type: string
+      value: 'test'
+'''
+        files = {
+            'child.yaml': child_template,
+            'value.yaml': value_template,
+        }
+        stack_identifier = self.stack_create(
+            template=parent_template,
+            files=files,
+            timeout=10,  # in minutes
+        )
+
+        resources = self.client.resources.list(
+            stack_identifier, nested_depth=2, with_detail=True)
+        timeouts = set()
+        for res in resources:
+            if res.resource_type == "OS::Heat::ResourceGroup":
+                nested_stack = self.client.stacks.get(res.physical_resource_id)
+                timeouts.add(nested_stack.timeout_mins)
+
+        self.assertEqual({10}, timeouts)
+
     def test_update_increase_decrease_count(self):
         # create stack with resource group count 2
         env = {'resource_registry':
diff --git a/openstack_heat.egg-info/PKG-INFO b/openstack_heat.egg-info/PKG-INFO
index 7ef1230..315b8c6 100644
--- a/openstack_heat.egg-info/PKG-INFO
+++ b/openstack_heat.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: openstack-heat
-Version: 17.0.0
+Version: 17.0.1
 Summary: OpenStack Orchestration
 Home-page: https://docs.openstack.org/heat/latest/
 Author: OpenStack
diff --git a/openstack_heat.egg-info/pbr.json b/openstack_heat.egg-info/pbr.json
index 4773ead..9aeecc8 100644
--- a/openstack_heat.egg-info/pbr.json
+++ b/openstack_heat.egg-info/pbr.json
@@ -1 +1 @@
-{"git_version": "4cf0ff641", "is_release": true}
 \ No newline at end of file
+{"git_version": "ef36cb304", "is_release": true}
 \ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 5e76541..eb87eff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ basepython = python3
 setenv = VIRTUAL_ENV={envdir}
          PYTHONWARNINGS=default::DeprecationWarning
          OS_TEST_PATH=heat/tests
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} {opts} {packages}
 usedevelop = True
 deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
        -r{toxinidir}/requirements.txt