Merge "Added new param for glusterfs"
diff --git a/apache/server/proxy/openstack/ironic.yml b/apache/server/proxy/openstack/ironic.yml
new file mode 100644
index 0000000..d6bd7d3
--- /dev/null
+++ b/apache/server/proxy/openstack/ironic.yml
@@ -0,0 +1,24 @@
+parameters:
+ _param:
+ apache_proxy_ssl:
+ enabled: false
+ apache_proxy_openstack_api_host: ${_param:cluster_public_host}
+ apache_proxy_openstack_api_address: 0.0.0.0
+ apache_proxy_openstack_ironic_host: ${_param:ironic_service_host}
+ apache:
+ server:
+ site:
+ apache_proxy_openstack_api_ironic:
+ enabled: true
+ type: proxy
+ name: openstack_api_ironic
+ check: false
+ proxy:
+ host: ${_param:apache_proxy_openstack_ironic_host}
+ port: 6385
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 6385
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
diff --git a/haproxy/proxy/listen/radosgw.yml b/haproxy/proxy/listen/radosgw.yml
index ecdeb6b..434555d 100644
--- a/haproxy/proxy/listen/radosgw.yml
+++ b/haproxy/proxy/listen/radosgw.yml
@@ -2,6 +2,12 @@
_param:
haproxy_radosgw_bind_port: 8080
haproxy_radosgw_source_port: 8080
+ ceph_rgw_node01_hostname: ${_param:cluster_node01_hostname}
+ ceph_rgw_node02_hostname: ${_param:cluster_node02_hostname}
+ ceph_rgw_node03_hostname: ${_param:cluster_node03_hostname}
+ ceph_rgw_node01_address: ${_param:cluster_node01_address}
+ ceph_rgw_node02_address: ${_param:cluster_node02_address}
+ ceph_rgw_node03_address: ${_param:cluster_node03_address}
haproxy:
proxy:
listen:
@@ -12,15 +18,15 @@
- address: ${_param:cluster_vip_address}
port: ${_param:haproxy_radosgw_bind_port}
servers:
- - name: ${_param:cluster_node01_hostname}
- host: ${_param:cluster_node01_address}
+ - name: ${_param:ceph_rgw_node01_hostname}
+ host: ${_param:ceph_rgw_node01_address}
port: ${_param:haproxy_radosgw_source_port}
params: check
- - name: ${_param:cluster_node02_hostname}
- host: ${_param:cluster_node02_address}
+ - name: ${_param:ceph_rgw_node02_hostname}
+ host: ${_param:ceph_rgw_node02_address}
port: ${_param:haproxy_radosgw_source_port}
params: check
- - name: ${_param:cluster_node03_hostname}
- host: ${_param:cluster_node03_address}
+ - name: ${_param:ceph_rgw_node03_hostname}
+ host: ${_param:ceph_rgw_node03_address}
port: ${_param:haproxy_radosgw_source_port}
params: check
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 80cfd95..8122e8c 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -15,6 +15,7 @@
- method groovy.util.Node attributes
- method groovy.util.XmlParser parse java.io.File
- method groovy.util.XmlParser parseText java.lang.String
+ - method hudson.EnvVars get java.lang.String java.lang.String
- method hudson.PluginManager getPlugins
- method hudson.PluginWrapper getShortName
- method hudson.model.Hudson getSlaves