Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
be16a4bf Change docker_image_cvp_sanity_checks to 2019.2.18
ba25baca Set trigger for run backupninja_backup job
ba9966bf Add UPDATE_TO_MYSQL57 flag to "Deploy - upgrade Galera cluster" job
339a634d Add mysql version selector to galera pillars
7842e78d Update docker images with CVE fixes
0801cbea Add milliseconds to wsgi logs of panko, aodh, barbican.
50b30f75 Return logs of panko, aodh, barbican to older format
0433333e Fix issue with milliseconds in logs shiped to elastic.
Change-Id: I511e1168d2e2b054239ea7f0ad96b227c5392a50
diff --git a/.gitreview b/.gitreview
index 3ff18c8..f84fc6e 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
host=gerrit.mcp.mirantis.com
port=29418
project=salt-models/reclass-system.git
+defaultbranch=release/proposed/2019.2.0
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 6ecc736..10d8051 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -5,36 +5,37 @@
# 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.15"
+ docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/cicd/openldap:2019.2.18"
docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.22-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.17"
+ docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.18"
# 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.17"
# jenkins:2.263.4
- docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.16"
- docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.17"
+ docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.18"
+ docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.18"
# TODO: fix tag
- docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.16"
+ docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.18"
# 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.14"
# stacklight
- docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta:2019.2.16"
+ # docker-prod-local.docker.mirantis.net/mcp/alerta:7.4.4-xenial-1643914808167
+ docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta:2019.2.18"
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.16"
- # docker-dev-kaas-virtual.docker.mirantis.net/stacklight/prometheus-es-exporter:v0.14.0-20210812120726
- docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:2019.2.17"
+ # docker-dev-kaas-local.docker.mirantis.net/stacklight/prometheus-es-exporter:v0.14.0-20220203190126
+ docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:2019.2.18"
docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:2019.2.14"
- # http://docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-reporter:v0.1-20211122164045
- docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.17"
+ # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-reporter:v0.1-20220203190047
+ docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.18"
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.14"
@@ -42,15 +43,15 @@
docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:2019.2.17"
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"
- # mirantis.azurecr.io/stacklight/sf-notifier:v0.3-20210617140951
- docker_image_sf_notifier: "${_param:mcp_docker_registry}/openstack-docker/sf-notifier:2019.2.15"
+ # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-notifier:v0.3-20220203185858
+ docker_image_sf_notifier: "${_param:mcp_docker_registry}/openstack-docker/sf-notifier:2019.2.18"
##
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.16"
+ docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.18"
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.14"
docker_image_cvp_rally: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-rally:2019.2.5"
@@ -79,13 +80,13 @@
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.15
+ name: openldap:2019.2.18
- 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.22-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.17
+ name: phpldapadmin:2019.2.18
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
@@ -99,13 +100,13 @@
- 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.17
+ name: jnlp-slave:2019.2.18
- 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.16
+ name: ssh-slave:2019.2.18
- 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.16
+ name: jenkins:2019.2.18
- 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
@@ -124,7 +125,7 @@
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.16
+ name: alerta:2019.2.18
- 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.14
@@ -133,7 +134,7 @@
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.17
+ name: sf-reporter:2019.2.18
- 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.17
@@ -151,13 +152,13 @@
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.15
+ name: sf-notifier:2019.2.18
- 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.17
+ name: prometheus-es-exporter:2019.2.18
# OpenContrail 4.1
- registry: ${_param:mcp_docker_registry}/opencontrail-oc41
@@ -185,7 +186,7 @@
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.16
+ name: cvp-sanity-checks:2019.2.18
- 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/defaults/openstack/init.yml b/defaults/openstack/init.yml
index c8d4b17..b94c540 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -27,6 +27,7 @@
# RabbitMQ
rabbitmq_upgrade_enabled: ${_param:openstack_upgrade_enabled}
# Galera
+ galera_mysql_version: '5.6'
galera_upgrade_enabled: ${_param:openstack_upgrade_enabled}
# Openstack memcache
openstack_memcached_server_bind_address: 0.0.0.0
diff --git a/galera/server/cluster.yml b/galera/server/cluster.yml
index 2dd5962..a5aa455 100644
--- a/galera/server/cluster.yml
+++ b/galera/server/cluster.yml
@@ -4,3 +4,7 @@
- system.keepalived.cluster.instance.galera_vip
- system.galera.upgrade
- system.galera.server.clustercheck
+parameters:
+ galera:
+ version:
+ mysql: ${_param:galera_mysql_version}
diff --git a/jenkins/client/job/deploy/backupninja_backup.yml b/jenkins/client/job/deploy/backupninja_backup.yml
index 5473c1f..814f023 100644
--- a/jenkins/client/job/deploy/backupninja_backup.yml
+++ b/jenkins/client/job/deploy/backupninja_backup.yml
@@ -25,17 +25,17 @@
default: "${_param:jenkins_salt_api_url}"
ASK_CONFIRMATION:
type: boolean
- default: 'true'
+ default: 'false'
BACKUP_SALTMASTER_AND_MAAS:
type: boolean
default: 'true'
BACKUP_DOGTAG:
type: boolean
- default: 'true'
+ default: 'false'
BACKUP_KEYSTONE_CREDENTIAL_KEYS:
type: boolean
default: 'true'
trigger:
timer:
- enabled: false
+ enabled: true
spec: "${_param:backup_min} ${_param:backup_hour} ${_param:backup_day_of_month} ${_param:backup_month} ${_param:backup_day_of_week}"
diff --git a/jenkins/client/job/deploy/update/upgrade_galera.yml b/jenkins/client/job/deploy/update/upgrade_galera.yml
index 8864529..8ebaf51 100644
--- a/jenkins/client/job/deploy/update/upgrade_galera.yml
+++ b/jenkins/client/job/deploy/update/upgrade_galera.yml
@@ -27,6 +27,10 @@
SALT_MASTER_CREDENTIALS:
type: string
default: "salt"
+ UPDATE_TO_MYSQL57:
+ type: boolean
+ default: 'false'
+ description: "Set this flag if you are updating MySQL from 5.6 to 5.7"
SHUTDOWN_CLUSTER:
type: boolean
default: 'false'