Merge "Add gabbi tests for resource REST API"
diff --git a/api/test_heat_api.py b/api/test_heat_api.py
index 1b57137..2e219e7 100644
--- a/api/test_heat_api.py
+++ b/api/test_heat_api.py
@@ -30,6 +30,9 @@
test_dir = os.path.join(os.path.dirname(__file__), TESTS_DIR)
conf = config.CONF.heat_plugin
+ if conf.auth_url is None:
+ # It's not configured, let's not load tests
+ return
manager = clients.ClientManager(conf)
endpoint = manager.identity_client.get_endpoint_url(
'orchestration', conf.region)
diff --git a/common/clients.py b/common/clients.py
index afdc477..9949d3d 100644
--- a/common/clients.py
+++ b/common/clients.py
@@ -158,7 +158,7 @@
service_type='compute',
endpoint_type='publicURL',
region_name=region,
- no_cache=True,
+ os_cache=False,
insecure=self.insecure,
cacert=self.ca_file,
http_log_debug=True)
diff --git a/common/config.py b/common/config.py
index 4aa7e67..f7b9d6c 100644
--- a/common/config.py
+++ b/common/config.py
@@ -150,7 +150,7 @@
help='Count of retries to edit config file during sighup. If '
'another worker already edit config file, file can be '
'busy, so need to wait and try edit file again.'),
- cfg.StrOpt('heat-config-notify-script',
+ cfg.StrOpt('heat_config_notify_script',
default=('heat-config-notify'),
help="Path to the script heat-config-notify"),
diff --git a/functional/test_software_config.py b/functional/test_software_config.py
index 860d688..815893f 100644
--- a/functional/test_software_config.py
+++ b/functional/test_software_config.py
@@ -149,7 +149,7 @@
iv = dict((i['name'], i['value']) for i in dep['inputs'])
sigurl = iv.get('deploy_signal_id')
requests.post(sigurl, data='{}',
- headers={'content-type': None},
+ headers={'content-type': 'application/json'},
verify=self.verify_cert)