Merge "Skip incompatible heat tests (Contrail)"
diff --git a/_modules/runtest/tempest_sections/dashboard.py b/_modules/runtest/tempest_sections/dashboard.py
index b28781e..369bdda 100644
--- a/_modules/runtest/tempest_sections/dashboard.py
+++ b/_modules/runtest/tempest_sections/dashboard.py
@@ -20,12 +20,21 @@
return
nginx_enable = conditions.BaseRule('nginx.server.enabled', 'eq', True)
+ haproxy_enable = conditions.BaseRule('haproxy.proxy.enabled', 'eq', True, multiple='any')
if self.get_item_when_condition_match('horizon.server.enabled', horizon_enable):
if self.get_item_when_condition_match('nginx.server.site.nginx_proxy_openstack_web.enabled', nginx_enable):
port = self.get_item_when_condition_match('nginx.server.site.nginx_proxy_openstack_web.host.port', nginx_enable)
protocol = self.get_item_when_condition_match('nginx.server.site.nginx_proxy_openstack_web.host.protocol', nginx_enable)
ip = self.get_item_when_condition_match('nginx.server.site.nginx_proxy_openstack_web.host.name', nginx_enable)
+ elif self.get_item_when_condition_match('haproxy.proxy.listen.openstack_web', haproxy_enable):
+ binds_data = self.get_item_when_condition_match('haproxy.proxy.listen.openstack_web.binds', haproxy_enable)
+ ip = binds_data[0]['address']
+ port = binds_data[0]['port']
+ if port == 443:
+ protocol = 'https'
+ else:
+ protocol = binds_data[0]['protocol']
else:
port = self.get_item_when_condition_match('horizon.server.bind.port', horizon_enable)
protocol = 'http'
diff --git a/runtest/salttest/modules/openstack/cinderv3.sls b/runtest/salttest/modules/openstack/cinderv3.sls
index 90a2b99..e2cfc78 100644
--- a/runtest/salttest/modules/openstack/cinderv3.sls
+++ b/runtest/salttest/modules/openstack/cinderv3.sls
@@ -57,4 +57,10 @@
- require:
- cinderv3_volume_type_create
-{%- endif -%}
\ No newline at end of file
+cinderv3_service_list:
+ module.run:
+ - name: cinderv3.service_list
+ - kwargs:
+ cloud_name: admin_identity
+
+{%- endif -%}
diff --git a/runtest/salttest/modules/openstack/heatv1.sls b/runtest/salttest/modules/openstack/heatv1.sls
index f819094..acde168 100644
--- a/runtest/salttest/modules/openstack/heatv1.sls
+++ b/runtest/salttest/modules/openstack/heatv1.sls
@@ -47,4 +47,10 @@
remove_heatv1_module_resource:
file.directory:
- name: /srv/heat
- - clean: True
\ No newline at end of file
+ - clean: True
+
+heatv1_service_list:
+ module.run:
+ - name: heatv1.service_list
+ - kwargs:
+ cloud_name: admin_identity
diff --git a/runtest/salttest/modules/openstack/manilang.sls b/runtest/salttest/modules/openstack/manilang.sls
new file mode 100644
index 0000000..ffa861f
--- /dev/null
+++ b/runtest/salttest/modules/openstack/manilang.sls
@@ -0,0 +1,5 @@
+manilang_service_list:
+ module.run:
+ - name: manilang.service_list
+ - kwargs:
+ cloud_name: admin_identity