Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
96b58eb2 Revert "Update Jenkins with Git plugin"
b7392b3b Update hostname entry for openldap
9376b68a Fix pipeline name
5d50cea5 Update Jenkins with Git plugin
7e8e083b Bump Contrail packages to 2019.2.14
5115845d Change postgres docker image to alpine
31be702e Update docker images
f64ba7f7 Upgrade docker images
0e346a7f Set galera haproxy timeouts to 28810 seconds
631e6eae Fix notifier image name
fcf15f74 Update docker images
e2a663bc Bump RabbitMQ file limits
5b3ef983 Add ability to remove ceph node from cluster if offline
Change-Id: Iec0e2437c1449a8a210f5d16a4e9562ae26f6490
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index e69638e..31d5df4 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -5,58 +5,62 @@
# 2.6.2 version, from 12/18/2108, differ from latest 2.6.2 upstream - update next cycle
docker_image_registry: "${_param:mcp_docker_registry}/mirantis/external/registry:2019.2.6"
docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:2019.2.6"
- docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/cicd/openldap:2019.2.13"
- docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.20"
+ docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/cicd/openldap:2019.2.14"
+ docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.21-alpine"
# 3.4.13, from Feb 15, differ from 3.4.13 upstream verison, from March 14 - update next cycle
docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/mongo:2019.2.6"
###
# phpldapadmin:0.9.0
- docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.13"
+ docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.14"
# gerrit:2.15.18
docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:2019.2.11"
# mysql:5.6.51
docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.13"
# jenkins:2.204.3
- docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.13"
- docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.11"
+ docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.14"
+ docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.14"
# TODO: fix tag
- docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.13"
+ docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.14"
# model-generator
docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:2019.2.6"
docker_image_operations_ui: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-ui:2019.2.6"
# OpenContrail
- opencontrail_docker_image_tag: "2019.2.13"
+ opencontrail_docker_image_tag: "2019.2.14"
# stacklight
- # locally forked v7.4.4, updated 2020-08-06
- docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta:2019.2.11"
- docker_image_alertmanager: "${_param:mcp_docker_registry}/openstack-docker/alertmanager:2019.2.4"
- docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:2019.2.10"
- docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:2019.2.6"
- docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:2019.2.10"
- docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.9"
+ # docker-kaas-local.artifactory.mirantis.com/stacklight/alerta-web:8.4.1-20210312131419
+ docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta-web:2019.2.14"
+ # docker-dev-local.docker.mirantis.net/openstack-docker/grafana:20210402121624
+ docker_image_alertmanager: "${_param:mcp_docker_registry}/openstack-docker/alertmanager:2019.2.14"
+ docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:2019.2.14"
+ # docker-kaas-local.artifactory.mirantis.com/stacklight/prometheus-es-exporter:v0.5.1-20210323132924
+ docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:2019.2.14"
+ docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:2019.2.14"
+ # mirantis.azurecr.io/stacklight/sf-reporter:v0.1-20201216142628
+ docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.14"
docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:2019.2.6"
docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus-relay:2019.2.11"
- docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:2019.2.6"
- docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:2019.2.12"
+ docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:2019.2.14"
+ # docker-kaas-local.artifactory.mirantis.com/stacklight/telegraf:v1.9.1-20210225142050
+ docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:2019.2.14"
docker_image_remote_collector: "${_param:mcp_docker_registry}/openstack-docker/heka:2019.2.6"
docker_image_remote_storage_adapter: "${_param:mcp_docker_registry}/openstack-docker/remote_storage_adapter:2019.2.6"
- docker_image_sf_notifier: "${_param:mcp_docker_registry}/openstack-docker/sf_notifier:2019.2.4"
+ docker_image_sf_notifier: "${_param:mcp_docker_registry}/openstack-docker/sf-notifier:2019.2.14"
##
docker_image_cockroachdb: "${_param:mcp_docker_registry}/mirantis/external/cockroach/cockroach:v2.1.1"
# keycloak
docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
# CVP
- docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.13"
+ docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.14"
docker_image_cvp_tempest: "${_param:mcp_docker_registry}/mirantis/cicd/ci-tempest:${_param:openstack_version}"
- docker_image_cvp_shaker_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:2019.2.3"
+ docker_image_cvp_shaker_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:2019.2.14"
docker_image_cvp_rally: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-rally:2019.2.5"
docker_image_cvp_xrally: "${_param:mcp_docker_registry}/mirantis/external/xrally/xrally-openstack:0.11.2"
# aptly
docker_image_aptly:
- base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:2019.2.13"
- public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.13"
- publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.13"
+ base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:2019.2.14"
+ public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.14"
+ publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.14"
# List of images, to be placed into offline image, during separate image build process
# WARNING: registry|target_registry and names - must be exactly same as list above!
@@ -76,33 +80,33 @@
name: compose:1.17.1
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: openldap:2019.2.13
+ name: openldap:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/external/library
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/library
- name: postgres:9.6.20
+ name: postgres:9.6.21-alpine
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: phpldapadmin:2019.2.13
+ name: phpldapadmin:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly:2019.2.13
+ name: aptly:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly-public:2019.2.13
+ name: aptly-public:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly-publisher:2019.2.13
+ name: aptly-publisher:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: jnlp-slave:2019.2.11
+ name: jnlp-slave:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: ssh-slave:2019.2.13
+ name: ssh-slave:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: jenkins:2019.2.13
+ name: jenkins:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: gerrit:2019.2.11
@@ -118,22 +122,22 @@
# stacklight
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: alertmanager:2019.2.4
+ name: alertmanager:2019.2.14
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: alerta:2019.2.11
+ name: alerta-web:2019.2.14
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: pushgateway:2019.2.6
+ name: pushgateway:2019.2.14
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: prometheus:2019.2.10
+ name: prometheus:2019.2.14
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: sf-reporter:2019.2.9
+ name: sf-reporter:2019.2.14
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: telegraf:2019.2.12
+ name: telegraf:2019.2.14
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
name: remote_storage_adapter:2019.2.6
@@ -142,19 +146,19 @@
name: prometheus-relay:2019.2.11
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: grafana:2019.2.10
+ name: grafana:2019.2.14
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
name: heka:2019.2.6
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: sf_notifier:2019.2.4
+ name: sf-notifier:2019.2.14
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
name: gainsight_elasticsearch:2019.2.6
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: prometheus-es-exporter:2019.2.6
+ name: prometheus-es-exporter:2019.2.14
# OpenContrail 4.1
- registry: ${_param:mcp_docker_registry}/opencontrail-oc41
@@ -179,10 +183,10 @@
name: cvp-rally:2019.2.5
- registry: ${_param:mcp_docker_registry}/mirantis/cvp
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-shaker:2019.2.3
+ name: cvp-shaker:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/cvp
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-sanity-checks:2019.2.13
+ name: cvp-sanity-checks:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/external/xrally
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/xrally
name: xrally-openstack:0.11.2
diff --git a/docker/swarm/stack/ldap.yml b/docker/swarm/stack/ldap.yml
index 71a646e..059db1a 100644
--- a/docker/swarm/stack/ldap.yml
+++ b/docker/swarm/stack/ldap.yml
@@ -32,7 +32,7 @@
# https://github.com/osixia/docker-openldap/issues/59
command: --copy-service
environment:
- HOSTNAME: ldap01.${_param:openldap_domain}
+ HOSTNAME: ldap01
LDAP_ORGANISATION: "${_param:openldap_organisation}"
LDAP_DOMAIN: "${_param:openldap_domain}"
LDAP_ADMIN_PASSWORD_FILE: /run/secrets/openldap-admin
diff --git a/haproxy/proxy/listen/openstack/galera/init.yml b/haproxy/proxy/listen/openstack/galera/init.yml
index 9f210d4..de937bc 100644
--- a/haproxy/proxy/listen/openstack/galera/init.yml
+++ b/haproxy/proxy/listen/openstack/galera/init.yml
@@ -3,6 +3,9 @@
haproxy_params_check: 'check port 9200'
haproxy:
proxy:
+ timeout:
+ server: 28810s
+ client: 28810s
listen:
mysql_cluster:
type: mysql
diff --git a/jenkins/client/job/ceph/add-osd-upmap.yml b/jenkins/client/job/ceph/add-osd-daemon.yml
similarity index 93%
rename from jenkins/client/job/ceph/add-osd-upmap.yml
rename to jenkins/client/job/ceph/add-osd-daemon.yml
index 1c1ccb1..f4669a5 100644
--- a/jenkins/client/job/ceph/add-osd-upmap.yml
+++ b/jenkins/client/job/ceph/add-osd-daemon.yml
@@ -2,10 +2,10 @@
jenkins:
client:
job:
- ceph-add-osd-upmap:
+ ceph-add-osd:
type: workflow-scm
concurrent: true
- display_name: "Ceph - add osd ( upmap )"
+ display_name: "Ceph - add osd"
description: "This pipeline requires ceph luminous version, all clients must be upgraded to luminous version to proceed."
discard:
build:
diff --git a/jenkins/client/job/ceph/init.yml b/jenkins/client/job/ceph/init.yml
index 464e07f..69a8423 100644
--- a/jenkins/client/job/ceph/init.yml
+++ b/jenkins/client/job/ceph/init.yml
@@ -2,7 +2,7 @@
- system.jenkins.client.job.ceph.remove-osd
- system.jenkins.client.job.ceph.replace-failed-osd
- system.jenkins.client.job.ceph.add-node
-- system.jenkins.client.job.ceph.add-osd-upmap
+- system.jenkins.client.job.ceph.add-osd-daemon
- system.jenkins.client.job.ceph.remove-node
- system.jenkins.client.job.ceph.upgrade
- system.jenkins.client.job.ceph.backend-migration
diff --git a/jenkins/client/job/ceph/remove-node.yml b/jenkins/client/job/ceph/remove-node.yml
index 9fdd102..959cbc0 100644
--- a/jenkins/client/job/ceph/remove-node.yml
+++ b/jenkins/client/job/ceph/remove-node.yml
@@ -32,6 +32,10 @@
type: string
description: Remove only those OSDs at HOST (comma-separated list or *). Leave empty if you going to remove a whole osd node. Only relevant with OSD node
default: ''
+ OSD_NODE_IS_DOWN:
+ type: boolean
+ description: Remove unavailable (offline) osd node from cluster, provided in HOST parameter
+ default: 'false'
CLUSTER_FLAGS:
type: string
description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
diff --git a/rabbitmq/server/cluster.yml b/rabbitmq/server/cluster.yml
index 68d7eba..3f0781b 100644
--- a/rabbitmq/server/cluster.yml
+++ b/rabbitmq/server/cluster.yml
@@ -6,4 +6,4 @@
parameters:
rabbitmq:
server:
- ulimit: 24576
\ No newline at end of file
+ ulimit: 49152
diff --git a/rabbitmq/server/single.yml b/rabbitmq/server/single.yml
index 4d2785d..5b1932b 100644
--- a/rabbitmq/server/single.yml
+++ b/rabbitmq/server/single.yml
@@ -4,4 +4,4 @@
parameters:
rabbitmq:
server:
- ulimit: 24576
\ No newline at end of file
+ ulimit: 49152
diff --git a/rabbitmq/sysctl/values.yml b/rabbitmq/sysctl/values.yml
new file mode 100644
index 0000000..3f710c5
--- /dev/null
+++ b/rabbitmq/sysctl/values.yml
@@ -0,0 +1,6 @@
+parameters:
+ linux:
+ system:
+ kernel:
+ sysctl:
+ fs.file-max: 248320