Merge "Don't require in-place MAC address update"
diff --git a/heat_tempest_plugin/tests/api/gabbits/softwareconfig.yaml b/heat_tempest_plugin/tests/api/gabbits/softwareconfig.yaml
index 0d0453d..018b29c 100644
--- a/heat_tempest_plugin/tests/api/gabbits/softwareconfig.yaml
+++ b/heat_tempest_plugin/tests/api/gabbits/softwareconfig.yaml
@@ -12,6 +12,7 @@
request_headers:
content-type: application/json
data:
+ name: $ENVIRON['PREFIX']-config
group: script
config: '#!/bin/sh -x\necho hello'
status: 200
diff --git a/heat_tempest_plugin/tests/functional/test_os_wait_condition.py b/heat_tempest_plugin/tests/functional/test_os_wait_condition.py
index 603b5e5..bb8513a 100644
--- a/heat_tempest_plugin/tests/functional/test_os_wait_condition.py
+++ b/heat_tempest_plugin/tests/functional/test_os_wait_condition.py
@@ -106,5 +106,5 @@
params = {'flavor': self.conf.minimal_instance_type,
'image': self.conf.minimal_image_ref,
'network': self.conf.fixed_network_name,
- 'timeout': 120}
+ 'timeout': 180}
self.stack_create(template=self.template, parameters=params)
diff --git a/heat_tempest_plugin/tests/scenario/test_remote_deeply_nested.py b/heat_tempest_plugin/tests/scenario/test_remote_deeply_nested.py
index d020e63..ef05285 100644
--- a/heat_tempest_plugin/tests/scenario/test_remote_deeply_nested.py
+++ b/heat_tempest_plugin/tests/scenario/test_remote_deeply_nested.py
@@ -22,7 +22,7 @@
def test_remote_nested(self):
parameters = {
'name': 'remote-nested',
- 'network_name': 'public',
+ 'network_name': self.conf.floating_network_name,
}
stack_id = self.launch_stack(