commit 9a96ee3041053838524f8a5f6b5ba21507a267f8
author Vasyl Saienko <vsaienko@mirantis.com> Wed May 08 13:47:26 2019 +0000
committer Gerrit Code Review <mail@domain.com> Wed May 08 13:47:26 2019 +0000
tree 2b29242ecb77e278d1542eaff58952e515b01ec8
parent 3e0ac60140e057c29b41c596d3bf83af5f21dc02
parent edaf7481d5616bd905911c502a070b6b45a69fa1

Merge "Add configuration option 'image_conversion_dir' for cinder."

jenkins/client/approved_scripts.yml

diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 43bc5e2..90273a2 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -141,6 +141,7 @@
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.lang.String int
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.util.Collection java.lang.String
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.util.List groovy.lang.Range
+        - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.util.regex.Matcher java.util.Collection
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getBytes java.io.File
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getText java.io.InputStream
         - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods hasProperty java.lang.Object java.lang.String

kubernetes/pool/images/drivetrain.yml

diff --git a/kubernetes/pool/images/drivetrain.yml b/kubernetes/pool/images/drivetrain.yml
index 94f5302..c62a31c 100644
--- a/kubernetes/pool/images/drivetrain.yml
+++ b/kubernetes/pool/images/drivetrain.yml
@@ -7,4 +7,10 @@
       - ${_param:docker_image_jenkins}
       - ${_param:docker_image_openldap}
       - ${_param:docker_image_phpldapadmin}
-      - ${_param:docker_image_mysql}
\ No newline at end of file
+      - ${_param:docker_image_mysql}
+      - ${_param:kubernetes_calico_kube_controllers_image}
+      - ${_param:kubernetes_coredns_image}
+      - ${_param:kubernetes_helm_tiller_image}
+      - ${_param:kubernetes_ingressnginx_controller_image}
+      - ${_param:kubernetes_metallb_controller_image}
+      - ${_param:kubernetes_metallb_speaker_image}

openssh/server/single.yml

diff --git a/openssh/server/single.yml b/openssh/server/single.yml
index b6055aa..0288a21 100644
--- a/openssh/server/single.yml
+++ b/openssh/server/single.yml
@@ -1,3 +1,37 @@
 classes:
 - service.openssh.server
 - service.openssh.server.cis
+# TODO: Uncomment service.openssh.server.sshd-strong-ciphers
+# when package with https://gerrit.mcp.mirantis.com/#/c/36220/
+# will be published.
+#- service.openssh.server.sshd-strong-ciphers
+# TODO: Remove parameters:openssh:server:ciphers completely
+# when package with https://gerrit.mcp.mirantis.com/#/c/36220/
+# will be published.
+parameters:
+  openssh:
+    server:
+      ciphers:
+        "3des-cbc":
+          enabled: True
+        "aes128-cbc":
+          enabled: True
+        "aes192-cbc":
+          enabled: True
+        "aes256-cbc":
+          enabled: True
+        "aes128-ctr":
+          enabled: True
+        "aes192-ctr":
+          enabled: True
+        "aes256-ctr":
+          enabled: True
+        "aes128-gcm@openssh.com":
+          enabled: True
+        "aes256-gcm@openssh.com":
+          enabled: True
+        "chacha20-poly1305@openssh.com":
+          enabled: True
+        "rijndael-cbc@lysator.liu.se":
+          enabled: True
+

xtrabackup/client/single.yml

diff --git a/xtrabackup/client/single.yml b/xtrabackup/client/single.yml
index cf88e28..c67925a 100644
--- a/xtrabackup/client/single.yml
+++ b/xtrabackup/client/single.yml
@@ -8,3 +8,8 @@
     client:
       cron: false
       throttle: ${_param:xtrabackup_client_throttle}
+  linux:
+    system:
+      package:
+        sysstat:
+          version: latest
\ No newline at end of file

xtrabackup/server/single.yml

diff --git a/xtrabackup/server/single.yml b/xtrabackup/server/single.yml
index 34ba45d..d440e48 100644
--- a/xtrabackup/server/single.yml
+++ b/xtrabackup/server/single.yml
@@ -14,3 +14,6 @@
         user:
           xtrabackup:
             enabled: true
+      package:
+        sysstat:
+          version: latest
\ No newline at end of file