diff options
| -rw-r--r-- | .zuul.yaml | 4 | ||||
| -rw-r--r-- | devstack/lib/heat | 4 | ||||
| -rw-r--r-- | doc/source/getting_started/on_devstack.rst | 4 | ||||
| -rw-r--r-- | heat/engine/resources/openstack/heat/delay.py | 6 | ||||
| -rw-r--r-- | heat/engine/resources/openstack/neutron/port.py | 3 | ||||
| -rw-r--r-- | heat/tests/openstack/neutron/test_neutron_port.py | 5 | ||||
| -rwxr-xr-x | heat_integrationtests/cleanup_test_env.sh | 2 | ||||
| -rwxr-xr-x | heat_integrationtests/prepare_test_env.sh | 2 | ||||
| -rw-r--r-- | releasenotes/notes/delay-resource-7d44c512081026c8.yaml | 4 |
9 files changed, 23 insertions, 11 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 8ce9f18f8..3cdb0dc83 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -27,6 +27,7 @@ - openstack/zaqar - openstack/tempest vars: + configure_swap_size: 8192 gabbi_tempest_path: heat_tempest_plugin.tests.api.gabbits tempest_plugins: - heat-tempest-plugin @@ -78,7 +79,7 @@ minimal_image_ref: ${DEFAULT_IMAGE_NAME:-cirros-0.3.6-x86_64-disk} instance_type: m1.heat_int minimal_instance_type: m1.heat_micro - image_ref: Fedora-Cloud-Base-30-1.2.x86_64 + image_ref: Fedora-Cloud-Base-31-1.9.x86_64 hidden_stack_tag: hidden heat_config_notify_script: /opt/stack/heat-agents/heat-config/bin/heat-config-notify boot_config_env: /opt/stack/heat-templates/hot/software-config/boot-config/test_image_env.yaml @@ -144,6 +145,7 @@ - opendev.org/openstack/heat-tempest-plugin - opendev.org/openstack/python-heatclient vars: + configure_swap_size: 8192 devstack_services: h-api: true h-api-cfn: true diff --git a/devstack/lib/heat b/devstack/lib/heat index 989b3efb9..62fce13ae 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -476,9 +476,9 @@ function configure_tempest_for_heat { 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/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2 + export HEAT_TEST_FEDORA_IMAGE=${NODEPOOL_FEDORA_MIRROR:-https://download.fedoraproject.org/pub/fedora/linux}/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2 TOKEN=$(openstack token issue -c id -f value) - local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-30-1.2.x86_64" ) + local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-31-1.9.x86_64" ) if [[ -z $image_exists ]]; then if is_service_enabled g-api; then upload_image $HEAT_TEST_FEDORA_IMAGE $TOKEN diff --git a/doc/source/getting_started/on_devstack.rst b/doc/source/getting_started/on_devstack.rst index ae5ecaa3a..32f67b8e3 100644 --- a/doc/source/getting_started/on_devstack.rst +++ b/doc/source/getting_started/on_devstack.rst @@ -51,8 +51,8 @@ a VM image that heat can launch. To do that add the following to `[[local|localrc]]` section of `local.conf`:: IMAGE_URL_SITE="https://download.fedoraproject.org" - IMAGE_URL_PATH="/pub/fedora/linux/releases/25/CloudImages/x86_64/images/" - IMAGE_URL_FILE="Fedora-Cloud-Base-25-1.3.x86_64.qcow2" + IMAGE_URL_PATH="/pub/fedora/linux/releases/31/CloudImages/x86_64/images/" + IMAGE_URL_FILE="Fedora-Cloud-Base-31-1.9.x86_64.qcow2" IMAGE_URLS+=","$IMAGE_URL_SITE$IMAGE_URL_PATH$IMAGE_URL_FILE URLs for any cloud image may be specified, but fedora images from F20 contain diff --git a/heat/engine/resources/openstack/heat/delay.py b/heat/engine/resources/openstack/heat/delay.py index 643a2b2c0..5a6623273 100644 --- a/heat/engine/resources/openstack/heat/delay.py +++ b/heat/engine/resources/openstack/heat/delay.py @@ -51,7 +51,7 @@ class Delay(resource.Resource): ) PROPERTIES = ( - MIN_WAIT_SECS, MAX_JITTER, JITTER_MULTIPLIER_SECS, ACTIONS, + MIN_WAIT_SECS, MAX_JITTER, JITTER_MULTIPLIER_SECS, DELAY_ACTIONS, ) = ( 'min_wait', 'max_jitter', 'jitter_multiplier', 'actions', ) @@ -84,7 +84,7 @@ class Delay(resource.Resource): constraints.Range(min=0), ] ), - ACTIONS: properties.Schema( + DELAY_ACTIONS: properties.Schema( properties.Schema.LIST, _('Actions during which the delay will occur.'), update_allowed=True, @@ -119,7 +119,7 @@ class Delay(resource.Resource): def _wait_secs(self, action): """Return a (randomised) wait time for the specified action.""" - if action not in self.properties[self.ACTIONS]: + if action not in self.properties[self.DELAY_ACTIONS]: return 0 min_wait_secs, max_jitter_secs = self._delay_parameters() diff --git a/heat/engine/resources/openstack/neutron/port.py b/heat/engine/resources/openstack/neutron/port.py index 0d31560e2..3977e8f0f 100644 --- a/heat/engine/resources/openstack/neutron/port.py +++ b/heat/engine/resources/openstack/neutron/port.py @@ -283,7 +283,8 @@ class Port(neutron.NeutronResource): 'the bindings extension.'), constraints=[ constraints.AllowedValues(['normal', 'direct', 'macvtap', - 'direct-physical', 'baremetal']), + 'direct-physical', 'baremetal', + 'virtio-forwarder']), ], support_status=support.SupportStatus(version='2015.1'), update_allowed=True, diff --git a/heat/tests/openstack/neutron/test_neutron_port.py b/heat/tests/openstack/neutron/test_neutron_port.py index c0a4df73f..12efe1c70 100644 --- a/heat/tests/openstack/neutron/test_neutron_port.py +++ b/heat/tests/openstack/neutron/test_neutron_port.py @@ -978,6 +978,11 @@ class UpdatePortTest(common.HeatTestCase): fixed_ips=None, addr_pair=None, vnic_type='baremetal')), + ('virtio_forwarder_vnic', dict(secgrp=None, + value_specs={}, + fixed_ips=None, + addr_pair=None, + vnic_type='virtio-forwarder')), ('with_all', dict(secgrp=['8a2f582a-e1cd-480f-b85d-b02631c10656'], value_specs={}, fixed_ips=[ diff --git a/heat_integrationtests/cleanup_test_env.sh b/heat_integrationtests/cleanup_test_env.sh index 4bfeb4f51..9862fd45f 100755 --- a/heat_integrationtests/cleanup_test_env.sh +++ b/heat_integrationtests/cleanup_test_env.sh @@ -30,4 +30,4 @@ openstack flavor delete m1.heat_int openstack flavor delete m1.heat_micro # delete the image created -openstack image delete Fedora-Cloud-Base-30-1.2.x86_64 +openstack image delete Fedora-Cloud-Base-31-1.9.x86_64 diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh index 05d7cbafc..cb38a152f 100755 --- a/heat_integrationtests/prepare_test_env.sh +++ b/heat_integrationtests/prepare_test_env.sh @@ -46,7 +46,7 @@ function _config_iniset { iniset $conf_file heat_plugin instance_type m1.heat_int iniset $conf_file heat_plugin minimal_instance_type m1.heat_micro - iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-30-1.2.x86_64 + iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-31-1.9.x86_64 iniset $conf_file heat_plugin minimal_image_ref $default_image_name iniset $conf_file heat_plugin hidden_stack_tag hidden diff --git a/releasenotes/notes/delay-resource-7d44c512081026c8.yaml b/releasenotes/notes/delay-resource-7d44c512081026c8.yaml new file mode 100644 index 000000000..27460753c --- /dev/null +++ b/releasenotes/notes/delay-resource-7d44c512081026c8.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + The ``OS::Heat::Delay`` resource type is now usable. |