Merge "add mkobus user"
diff --git a/horizon/server/plugin/manila.yml b/horizon/server/plugin/manila.yml
index 53ad9b6..ec00da6 100644
--- a/horizon/server/plugin/manila.yml
+++ b/horizon/server/plugin/manila.yml
@@ -6,3 +6,12 @@
source:
engine: pkg
name: python-manila-ui
+ policy:
+ share:
+ source: file
+ name: manila_policy.json
+ enabled: true
+ sharev2:
+ source: file
+ name: manila_policy.json
+ enabled: true
diff --git a/jenkins/client/job/saas/init.yml b/jenkins/client/job/saas/init.yml
new file mode 100644
index 0000000..5ec05c1
--- /dev/null
+++ b/jenkins/client/job/saas/init.yml
@@ -0,0 +1,2 @@
+classes:
+ - system.jenkins.client.job.saas.test_saas_ui
diff --git a/jenkins/client/job/saas/test_saas_ui.yml b/jenkins/client/job/saas/test_saas_ui.yml
new file mode 100644
index 0000000..f49dd7f
--- /dev/null
+++ b/jenkins/client/job/saas/test_saas_ui.yml
@@ -0,0 +1,43 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ test-saas-ui:
+ name: test-saas-ui
+ discard:
+ build:
+ keep_num: 15
+ artifact:
+ keep_num: 15
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+ credentials: "gerrit"
+ script: test-saas-ui-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "saas/frontend/ui":
+ branches:
+ - master
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ DEFAULT_GIT_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/saas/frontend/ui"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
diff --git a/keepalived/cluster/instance/stacklight_monitor_vip.yml b/keepalived/cluster/instance/stacklight_monitor_vip.yml
index e146f20..51283b2 100644
--- a/keepalived/cluster/instance/stacklight_monitor_vip.yml
+++ b/keepalived/cluster/instance/stacklight_monitor_vip.yml
@@ -3,11 +3,13 @@
classes:
- service.keepalived.support
parameters:
+ _param:
+ keepalived_docker_vrrp_script_content: "docker service ls"
keepalived:
cluster:
vrrp_scripts:
- check_pidof:
- args: "haproxy"
+ docker_service_ls:
+ content: ${_param:keepalived_docker_vrrp_script_content}
interval: 10
rise: 1
fall: 1
@@ -19,4 +21,4 @@
interface: ${_param:keepalived_stacklight_monitor_vip_interface}
virtual_router_id: 100
priority: 101
- track_script: check_pidof
+ track_script: docker_service_ls
diff --git a/keystone/client/service/panko.yml b/keystone/client/service/panko.yml
index 05f9453..b7c9fc3 100644
--- a/keystone/client/service/panko.yml
+++ b/keystone/client/service/panko.yml
@@ -1,6 +1,7 @@
parameters:
_param:
cluster_public_protocol: https
+ panko_service_protocol: http
keystone:
client:
server:
@@ -25,6 +26,8 @@
internal_address: ${_param:panko_service_host}
internal_port: 8977
internal_path: '/'
+ internal_protocol: ${_param:panko_service_protocol}
+ admin_protocol: ${_param:panko_service_protocol}
admin_address: ${_param:panko_service_host}
admin_port: 8977
admin_path: '/'
diff --git a/nginx/server/proxy/openstack/aodh.yml b/nginx/server/proxy/openstack/aodh.yml
index bfdb4d6..bd73165 100644
--- a/nginx/server/proxy/openstack/aodh.yml
+++ b/nginx/server/proxy/openstack/aodh.yml
@@ -1,6 +1,8 @@
parameters:
_param:
nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx_proxy_openstack_api_address: 0.0.0.0
+ nginx_proxy_openstack_aodh_host: ${_param:aodh_service_host}
nginx:
server:
enabled: true
@@ -11,10 +13,11 @@
name: openstack_api_aodh
check: false
proxy:
- host: ${_param:aodh_service_host}
+ host: ${_param:nginx_proxy_openstack_aodh_host}
port: 8042
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 8042
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/openstack/ceilometer.yml b/nginx/server/proxy/openstack/ceilometer.yml
index 57315fe..938b6cf 100644
--- a/nginx/server/proxy/openstack/ceilometer.yml
+++ b/nginx/server/proxy/openstack/ceilometer.yml
@@ -1,6 +1,8 @@
parameters:
_param:
nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx_proxy_openstack_api_address: 0.0.0.0
+ nginx_proxy_openstack_ceilometer_host: ${_param:ceilometer_service_host}
nginx:
server:
enabled: true
@@ -11,10 +13,11 @@
name: openstack_api_ceilometer
check: false
proxy:
- host: ${_param:ceilometer_service_host}
+ host: ${_param:nginx_proxy_openstack_ceilometer_host}
port: 8777
protocol: http
host:
name: ${_param:nginx_proxy_openstack_api_host}
port: 8777
+ address: ${_param:nginx_proxy_openstack_api_address}
ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/openstack/gnocchi.yml b/nginx/server/proxy/openstack/gnocchi.yml
new file mode 100644
index 0000000..2f6d0e5
--- /dev/null
+++ b/nginx/server/proxy/openstack/gnocchi.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx_proxy_openstack_api_address: 0.0.0.0
+ nginx_proxy_openstack_gnocchi_host: ${_param:gnocchi_service_host}
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_openstack_api_gnocchi:
+ enabled: true
+ type: nginx_proxy
+ name: openstack_api_gnocchi
+ check: false
+ proxy:
+ host: ${_param:nginx_proxy_openstack_gnocchi_host}
+ port: 8041
+ protocol: http
+ host:
+ name: ${_param:nginx_proxy_openstack_api_host}
+ port: 8041
+ address: ${_param:nginx_proxy_openstack_api_address}
+ ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/openstack/panko.yml b/nginx/server/proxy/openstack/panko.yml
new file mode 100644
index 0000000..6081dd1
--- /dev/null
+++ b/nginx/server/proxy/openstack/panko.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx_proxy_openstack_api_address: 0.0.0.0
+ nginx_proxy_openstack_panko_host: ${_param:panko_service_host}
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_openstack_api_panko:
+ enabled: true
+ type: nginx_proxy
+ name: openstack_api_panko
+ check: false
+ proxy:
+ host: ${_param:nginx_proxy_openstack_panko_host}
+ port: 8977
+ protocol: http
+ host:
+ name: ${_param:nginx_proxy_openstack_api_host}
+ port: 8977
+ address: ${_param:nginx_proxy_openstack_api_address}
+ ssl: ${_param:nginx_proxy_ssl}