Merge "Set contrail-api workers count to 1 by default"
diff --git a/jenkins/client/job/deploy/galera_verify_restore.yml b/jenkins/client/job/deploy/galera_verify_restore.yml
index 3b9127e..5a32bb5 100644
--- a/jenkins/client/job/deploy/galera_verify_restore.yml
+++ b/jenkins/client/job/deploy/galera_verify_restore.yml
@@ -25,3 +25,6 @@
SALT_MASTER_URL:
type: string
default: "${_param:jenkins_salt_api_url}"
+ ASK_CONFIRMATION:
+ type: boolean
+ default: 'true'
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index a05b1ad..5a26020 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -12,9 +12,9 @@
- system.jenkins.client.job.deploy.update.upgrade_opencontrail4_0
- system.jenkins.client.job.deploy.update.update_opencontrail4
- system.jenkins.client.job.deploy.update.upgrade_stacklight
- - system.jenkins.client.job.deploy.update.restore_mysql
- system.jenkins.client.job.deploy.update.restore_cassandra
- system.jenkins.client.job.deploy.update.restore_zookeeper
- system.jenkins.client.job.deploy.update.virt_snapshot
- system.jenkins.client.job.deploy.update.cloud_update
- system.jenkins.client.job.deploy.update.kubernetes_update
+ - system.jenkins.client.job.deploy.galera_verify_restore
diff --git a/jenkins/client/job/deploy/update/restore_mysql.yml b/jenkins/client/job/deploy/update/restore_mysql.yml
deleted file mode 100644
index aaf4552..0000000
--- a/jenkins/client/job/deploy/update/restore_mysql.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Jobs to update packages on given Salt master environment
-#
-parameters:
- _param:
- jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
- jenkins:
- client:
- job:
- deploy-mysql-db-restore:
- type: workflow-scm
- concurrent: true
- discard:
- build:
- keep_num: 10
- artifact:
- keep_num: 10
- display_name: "Xtrabackup - restore mysql db"
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- branch: "${_param:jenkins_pipelines_branch}"
- credentials: "gerrit"
- script: xtrabackup-restore-mysql-db.groovy
- param:
- SALT_MASTER_URL:
- type: string
- default: "${_param:jenkins_salt_api_url}"
- SALT_MASTER_CREDENTIALS:
- type: string
- default: "salt"
-
diff --git a/nginx/server/proxy/openstack/placement.yml b/nginx/server/proxy/openstack/placement.yml
index a54966e..cb88a6d 100644
--- a/nginx/server/proxy/openstack/placement.yml
+++ b/nginx/server/proxy/openstack/placement.yml
@@ -1,5 +1,6 @@
parameters:
_param:
+ placement_service_host: ${_param:nova_service_host}
nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
nginx_proxy_openstack_api_address: 0.0.0.0
nginx_proxy_openstack_placement_host: ${_param:placement_service_host}