Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
dae5111f Update docker images
6c05fbfd Set kernel.unprivileged_userns_clone to 0
56c71d43 Add Kononenko Oleksandr and Biletskiy Denis in ssh server team members
Change-Id: I76b8900d5e915d836929c806d0447ba6aea88a34
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index ed9200e..7625d37 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -11,16 +11,16 @@
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.19"
+ docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.20"
# 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.19"
+ docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.20"
# jenkins:2.263.4
docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.19"
docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.19"
# TODO: fix tag
- docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.19"
+ docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.20"
# 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"
@@ -34,8 +34,8 @@
# docker-dev-kaas-local.docker.mirantis.net/stacklight/prometheus-es-exporter:v0.14.0-20220420134722
docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:2019.2.19"
docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:2019.2.14"
- # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-reporter:v0.1-20220419092138
- docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.19"
+ # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-reporter:v0.1-20220622101204
+ docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.20"
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"
@@ -86,7 +86,7 @@
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.19
+ name: phpldapadmin:2019.2.20
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
@@ -103,7 +103,7 @@
name: jnlp-slave:2019.2.19
- 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.19
+ name: ssh-slave:2019.2.20
- 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.19
@@ -134,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.19
+ name: sf-reporter:2019.2.20
- 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
@@ -193,7 +193,7 @@
#
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: mysql:2019.2.19
+ name: mysql:2019.2.20
- registry: ${_param:mcp_docker_registry}/mirantis/external
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
name: mongo:2019.2.6
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:
diff --git a/openssh/server/team/members/dbiletskiy.yml b/openssh/server/team/members/dbiletskiy.yml
new file mode 100644
index 0000000..fad77be
--- /dev/null
+++ b/openssh/server/team/members/dbiletskiy.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ dbiletskiy:
+ email: dbiletskiy@mirantis.com
+ enabled: true
+ full_name: Denis Biletskiy
+ home: /home/dbiletskiy
+ name: dbiletskiy
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ dbiletskiy:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCwW/ypCO2Q98Vh606YPXILbMCaMk7Af0qC7rT1gmuEnHaSNUht+v+mth+DXzc7t3eJmrdEfvH2C+qLUeHx61nh1LPsD8e+TkeHLKf+jiamiUzIpnCxTf9fCDlVIxQ5IJNe7/o1+7dUh7PgBCITASRRedeAoExHMZGgOgETo5r+uYi/ZgYyKQqyVptdwkdHoihmP0+Yy3GUH/u2jZ5lYjgz4nSfd5heEYkcwPkKFQui+0J4zQ46WPSUt3pcBdFwRnABqQS9oWeCMHQBpzfwuiTo0E7AhHI1r0WkPNF4p+r9dknZZ/VGxHXKCWRqGUOxRo5kqAOK75OM4sQQ47F7GSB4DS7UG1set8TDp6Q0J0werVlAQY7zP2UOQtuV5fs9/WbYbyu/oVY2dHsRQ/UaJl1nJgSWHW2ICgM7IRYAayTxpHsJBN5k1g64+OhWAHeZUqi5ekM+4AdRoGTgsrr56nGOeWPJ0NkEcqKHiM7KrzgG5EvyeLOY+IibnS7wEqCr5pc= den@denwnb
+ user: ${linux:system:user:dbiletskiy}
diff --git a/openssh/server/team/members/okononenko.yml b/openssh/server/team/members/okononenko.yml
new file mode 100644
index 0000000..e3be8c9
--- /dev/null
+++ b/openssh/server/team/members/okononenko.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ okononenko:
+ email: okononenko@mirantis.com
+ enabled: true
+ full_name: Oleksandr Kononenko
+ home: /home/okononenko
+ name: okononenko
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ okononenko:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC1tfFKYbu5QSCnvqAxhLAY9We+lFLpkBB1tXMlVAUuqZEunumUuFuhHYmgWoDo6HQzSzmNCURFzgCYUPKDTFEiTa1lbsvZmyyB9Nq2IqkyWi8yr4M8X5/y6usS4plYQ/FtcIJgTeYmi+zp3FjdQxiar80P1jRETovehLqoHYx4N4/53wHDMROrONLkITuBISPlSMmM+DY22Tr6pCeQr5Sf0wFq7739+/+/s8RX6RWVuqh1FwcJ1qoN9YTJGSQ0RQOtbGaa38+cTtcwhBNTH2puzsayWzZhlU0lSuR0Qt3QyG1a71VAuR4M6XCDwwrXrbrlnysNWvMZJ0+JIuHU2QslFCftg3ahl65B/OUJ5sWTBPnNTxKB2aVMXxF6eAo0TW3MK/O6uQDA3+sJO/3nkxlDzODO4Yy61jquxTcEttwTSiKZRX4HzpdUYo+yumf1fFnUyeqUZY7ZYjRfpZvmzxQbz+feIbTug0LVom14/qQGurCCMqDGl/bQ/5W3c+S/wDE= okononenko@okononenko-pc
+ user: ${linux:system:user:okononenko}
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 864e007..c171cb2 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -19,6 +19,8 @@
- system.openssh.server.team.members.vmarkov
- system.openssh.server.team.members.aarefiev
- system.openssh.server.team.members.efedorova
+- system.openssh.server.team.members.okononenko
+- system.openssh.server.team.members.dbiletskiy
parameters:
_param:
linux_system_user_sudo: true