commit 604203f75a3af72b4f2eea448b0f146246983f36
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Aug 10 15:29:43 2022 +0000
committer Gerrit Code Review <gerrit@172.18.228.131> Wed Aug 10 15:29:43 2022 +0000
tree 1cda8f85980238adcc29fc37d0c1d11d04ea3007
parent 03fcf4ccacf59148d3ade7afe7541c8a6d62cf17
parent ca5f08383ab97f1b64d663841061105e8ba490b2

Merge "Update alerta receiver for alertmanager with basic http auth" into release/proposed/2019.2.0

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index e2aeb7e..c11811f 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -51,7 +51,7 @@
     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.19"
+    docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.21"
     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"
@@ -186,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.19
+          name: cvp-sanity-checks:2019.2.21
         - 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

jenkins/client/job/ceph/remove-node.yml

diff --git a/jenkins/client/job/ceph/remove-node.yml b/jenkins/client/job/ceph/remove-node.yml
index 959cbc0..11b02d0 100644
--- a/jenkins/client/job/ceph/remove-node.yml
+++ b/jenkins/client/job/ceph/remove-node.yml
@@ -27,7 +27,7 @@
               default: salt
             HOST:
               type: string
-              description: HOST to remove from thecluster
+              description: HOST to remove from the cluster
             OSD:
               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

linux/system/single/mcp.yml

diff --git a/linux/system/single/mcp.yml b/linux/system/single/mcp.yml
index 74afc08..496bc7e 100644
--- a/linux/system/single/mcp.yml
+++ b/linux/system/single/mcp.yml
@@ -26,6 +26,7 @@
           net.core.netdev_max_backlog: 261144
           net.ipv4.tcp_tw_reuse: 1
           kernel.panic: 60
+          kernel.unprivileged_userns_clone: 0
       cpu:
         governor: performance
       limit: