Merge "[Update] Added libvirtd certificate templates"
diff --git a/apache/server/proxy/openstack/oadh.yml b/apache/server/proxy/openstack/oadh.yml
new file mode 100644
index 0000000..d8ae2eb
--- /dev/null
+++ b/apache/server/proxy/openstack/oadh.yml
@@ -0,0 +1,25 @@
+parameters:
+ _param:
+ apache_ssl:
+ enabled: false
+ apache_proxy_ssl: ${_param:apache_ssl}
+ apache_proxy_openstack_api_host: ${_param:cluster_public_host}
+ apache_proxy_openstack_api_address: 0.0.0.0
+ apache_proxy_openstack_aodh_host: ${_param:aodh_service_host}
+ apache:
+ server:
+ enabled: true
+ site:
+ apache_proxy_openstack_api_aodh:
+ enabled: true
+ type: proxy
+ name: openstack_api_aodh
+ proxy:
+ host: ${_param:apache_proxy_openstack_aodh_host}
+ port: 8042
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 8042
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index bccb9b7..c082306 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -99,6 +99,11 @@
OPENSTACK_API_VERSION:
type: string
default: "3"
+ # security test
+ RUN_SECURITY_CHECK:
+ type: boolean
+ description: Whether to run Openscap XCCDF evaluation
+ default: 'false'
# test
TEST_CONF:
type: string
@@ -682,7 +687,7 @@
trigger:
gerrit:
project:
- "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican|aodh|ceilometer|gnocchi|panko|manila|salt|linux|reclass|galera|memcached|rabbitmq|bind|apache|runtest|oslo-templates|auditd|octavia)$":
+ "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican|aodh|ceilometer|gnocchi|panko|manila|salt|linux|reclass|galera|memcached|rabbitmq|bind|apache|runtest|oslo-templates|auditd|octavia|openscap)$":
compare_type: 'REG_EXP'
branches:
- master
diff --git a/manila/common/cluster.yml b/manila/common/cluster.yml
index 9ea811e..ad1254b 100644
--- a/manila/common/cluster.yml
+++ b/manila/common/cluster.yml
@@ -1,7 +1,5 @@
classes:
- service.manila.common.cluster
-- service.haproxy.proxy.single
-- system.haproxy.proxy.listen.openstack.manila
- system.salt.minion.cert.mysql.clients.openstack.manila
- system.salt.minion.cert.rabbitmq.clients.openstack.manila
parameters:
@@ -12,6 +10,7 @@
openstack_rabbitmq_x509_enabled: False
rabbitmq_ssl_enabled: False
openstack_rabbitmq_port: 5672
+ cluster_internal_protocol: 'http'
manila:
common:
version: ${_param:openstack_version}
@@ -54,4 +53,4 @@
auth_type: password
user_domain_id: default
project_domain_id: default
- protocol: 'http'
+ protocol: ${_param:cluster_internal_protocol}
diff --git a/manila/common/single.yml b/manila/common/single.yml
index f984ab7..c5a6f97 100644
--- a/manila/common/single.yml
+++ b/manila/common/single.yml
@@ -9,6 +9,7 @@
openstack_rabbitmq_x509_enabled: False
rabbitmq_ssl_enabled: False
openstack_rabbitmq_port: 5672
+ cluster_internal_protocol: 'http'
manila:
common:
version: ${_param:openstack_version}
@@ -51,4 +52,4 @@
auth_type: password
user_domain_id: default
project_domain_id: default
- protocol: 'http'
+ protocol: ${_param:cluster_internal_protocol}
diff --git a/manila/control/cluster.yml b/manila/control/cluster.yml
index 7ea128b..75b6f76 100644
--- a/manila/control/cluster.yml
+++ b/manila/control/cluster.yml
@@ -1,7 +1,8 @@
classes:
- - system.manila.common.cluster
- - system.apache.server.site.manila
- - system.haproxy.proxy.listen.openstack.manila
+ - service.haproxy.proxy.single
+ - system.manila.common.cluster
+ - system.apache.server.site.manila
+ - system.haproxy.proxy.listen.openstack.manila
parameters:
manila:
common:
diff --git a/manila/share/init.yml b/manila/share/init.yml
index 2c6558e..346bfcd 100644
--- a/manila/share/init.yml
+++ b/manila/share/init.yml
@@ -1,5 +1,5 @@
classes:
- - service.manila.common.cluster
+ - system.manila.common.cluster
parameters:
manila:
common: