Merge "Add log_format variable for apache openstack sites"
diff --git a/jenkins/client/job/ceph/add-osd-upmap.yml b/jenkins/client/job/ceph/add-osd-upmap.yml
new file mode 100644
index 0000000..f6390a6
--- /dev/null
+++ b/jenkins/client/job/ceph/add-osd-upmap.yml
@@ -0,0 +1,32 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ ceph-add-osd-upmap:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Ceph - add osd"
+ description: "This pipeline requires ceph luminous version, all clients must be upgraded to luminous version to proceed."
+ discard:
+ build:
+ keep_num: 50
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: ceph-add-osd-upmap.groovy
+ param:
+ # general parameters
+ SALT_MASTER_URL:
+ type: string
+ description: URL of Salt master
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ description: Credentials for login to Salt API
+ default: salt
+ HOST:
+ type: string
+ description: OSD HOST that will be added to Ceph cluster (rgw04*)
+ default: 'osd*'
diff --git a/kubernetes/control/services/drivetrain/jenkins_master.yml b/kubernetes/control/services/drivetrain/jenkins_master.yml
index a198dff..3437196 100644
--- a/kubernetes/control/services/drivetrain/jenkins_master.yml
+++ b/kubernetes/control/services/drivetrain/jenkins_master.yml
@@ -15,6 +15,12 @@
value: false
- name: nginx.ingress.kubernetes.io/add-base-url
value: true
+ - name: nginx.ingress.kubernetes.io/proxy-body-size
+ value: "0"
+ - name: nginx.ingress.kubernetes.io/proxy-buffering
+ value: "off"
+ - name: nginx.ingress.kubernetes.io/proxy-request-buffering
+ value: "off"
apiVersion: extensions/v1beta1
cluster: drivetrain
enabled: true
diff --git a/neutron/control/ovn/single.yml b/neutron/control/ovn/single.yml
index f3dd749..5305fc9 100644
--- a/neutron/control/ovn/single.yml
+++ b/neutron/control/ovn/single.yml
@@ -40,17 +40,3 @@
db-sb-create-insecure-remote: 'yes'
db-nb-addr: ${_param:single_address}
db-sb-addr: ${_param:single_address}
- mysql:
- server:
- database:
- neutron:
- encoding: utf8
- users:
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: '%'
- rights: all
- - name: neutron
- password: ${_param:mysql_neutron_password}
- host: ${_param:cluster_local_address}
- rights: all