Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
64df3213 Update docker images
7f4ce6dd Update cvp_sanity_checks to 2019.2.19
daa32d01 Update jenkins docker tag to 2019.2.19
f05ed986 Update ssh key for mkarpin
238aef53 Add aarefiev and efedorova to oscore devops team
Change-Id: I3e677654cea6b625b383262bd5aa836dc5e25f89
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 10d8051..ed9200e 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -5,37 +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.18"
+ docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/cicd/openldap:2019.2.19"
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.18"
+ docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.19"
# 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"
+ docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.19"
# jenkins:2.263.4
- 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"
+ 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.18"
+ docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.19"
# 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-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-prod-local.docker.mirantis.net/mcp/alerta:7.4.4-xenial-1650474694302
+ docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta:2019.2.19"
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-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_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:2019.2.19"
+ # 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-20220203190047
- docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.18"
+ # 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_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"
@@ -43,24 +43,24 @@
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"
- # 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-dev-kaas-local.docker.mirantis.net/stacklight/sf-notifier:v0.3-20220420134728
+ docker_image_sf_notifier: "${_param:mcp_docker_registry}/openstack-docker/sf-notifier:2019.2.19"
##
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.18"
+ docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.19"
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"
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.16"
- public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.16"
- publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.16"
+ base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:2019.2.19"
+ public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.19"
+ publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.19"
# 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!
@@ -80,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.18
+ name: openldap:2019.2.19
- 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.18
+ name: phpldapadmin: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: aptly:2019.2.16
+ name: aptly: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: aptly-public:2019.2.16
+ name: aptly-public: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: aptly-publisher:2019.2.16
+ name: aptly-publisher: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: jnlp-slave:2019.2.18
+ 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.18
+ name: ssh-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: jenkins:2019.2.18
+ name: jenkins: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: gerrit:2019.2.11
@@ -125,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.18
+ name: alerta:2019.2.19
- 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
@@ -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.18
+ name: sf-reporter:2019.2.19
- 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
@@ -146,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.16
+ name: grafana:2019.2.19
- 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.18
+ name: sf-notifier:2019.2.19
- 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.18
+ name: prometheus-es-exporter:2019.2.19
# OpenContrail 4.1
- registry: ${_param:mcp_docker_registry}/opencontrail-oc41
@@ -186,14 +186,14 @@
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.18
+ name: cvp-sanity-checks:2019.2.19
- 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
#
- 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.17
+ name: mysql:2019.2.19
- 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/openssh/server/team/members/aarefiev.yml b/openssh/server/team/members/aarefiev.yml
new file mode 100644
index 0000000..d19767e
--- /dev/null
+++ b/openssh/server/team/members/aarefiev.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ aarefiev:
+ email: aarefiev@mirantis.com
+ enabled: true
+ full_name: Anton Arefiev
+ home: /home/aarefiev
+ name: aarefiev
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ aarefiev:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCkcIuvfXgmAdpEfV063NwiuzU5LoUNQHc+Oqecw1dt3saetkhXNY1ahV5MtudzX0uJzmYytteORqCfXsyHWZ6NwuGmW6BbPcz8RRBAbe86u1GYFMkznEltQnNDuqyGx/adt6Oxsk9BqrOTSk4eblPCXTP5E+xRQO3snrp6vzL/ov5qX2Yl4EvpMLvO4WR53MMH1jDVfx+HgTyyqmOWD5YTfCx12nxYPe7bz/TQyWCbpKNS9+/LuorW4RiBOR8M9Pxlec0M90dzh0ke6F3SG4SEfa0MtnDZD8FOGQy6G64xIR03mx5V42RicAChpTyRQpr027gWt5JvN6znt6f236TUBZw5U42UrmeL9yHYzs+ckvr1D5XtNodIhaovaPJLsMusxLwIK1SJ/cJrpc99Jocjh/KsKgICc7xDTteYsAd50q0rr+4qMJ3HmF8qIIfhBwFJpadFSG2XJCF6av2kiH7PD718yDZaa/6hE+ZxGtHjCDJNriO0865HCoRPMXaw3iM= aarefiev@mirantis.com
+ user: ${linux:system:user:aarefiev}
diff --git a/openssh/server/team/members/efedorova.yml b/openssh/server/team/members/efedorova.yml
new file mode 100644
index 0000000..8f37847
--- /dev/null
+++ b/openssh/server/team/members/efedorova.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ efedorova:
+ email: efedorova@mirantis.com
+ enabled: true
+ full_name: Ekaterina Chernova
+ home: /home/efedorova
+ name: efedorova
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ efedorova:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2WZDqD0R/6RNSx4KdR5QD/jmCWnl/4QHHZeu679gP6Sdy/Z2/Qzf9k7hBSwLFExjLCu4dIJGhdvB1HoG3S5qIqdhfKZTkJp2ackDPnegSAhgqem/tXcyQrMOe8jtCCK375kwsMV5dJkxadbv5Qb71TdwHeBsV5B3Kmi5q0WwSlzsq3AI8OvNn4KeSeEGGv2lK6Ddxwl1u5IcSf5G0zBGc8s0mwGPnsBIATfiztX61MkqyDPIuYacRpkaDLX5v/X7eYqxYxDop6OBLxR+mgivluDEyDaQ9DKHO5ypQIiAk359CxMSQ9T+y5WSL0MdgYSKxFsK8jzo6JquZC54ZUQKb efedorova
+ user: ${linux:system:user:efedorova}
\ No newline at end of file
diff --git a/openssh/server/team/members/mkarpin.yml b/openssh/server/team/members/mkarpin.yml
index 648089d..479edec 100644
--- a/openssh/server/team/members/mkarpin.yml
+++ b/openssh/server/team/members/mkarpin.yml
@@ -15,5 +15,5 @@
mkarpin:
enabled: true
public_keys:
- - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCcO+qMO4z5O75JmeoyHQKNjq72psAMO2lebEMl5MbgVs7BAOT3PChamRId3xhwX2X5R0vS1ZSgRm0XC4br2OpJ9DsBhOBbPRK/EyjAm5aTBW8eZZ69NDFam/hLJ6Xq+jZDdlBT8iK7CPxTJD+0wz1KqpIgYlUNkix5EEj2wfUAfw3j6lGiEVQ0Cpbejey9sYlUSitKcYs/EAX5byBBqkFCLL4/D77fLOIuWfDzAAStUR/wbOJnWNiIScifu4EUdcSdHra9RoQaRgo31ALq+BeYVpvqnyHTOw9t2q04sZVDN4anhUMAFh0n1CkbY/2HWpX/RYWt1bV6XtDeoCpsC5Ar nkarpin@nkarpin-pc
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJ5ZQkmO868RaxxbinJHsKjVY4cKbb7+HGUJKqaZRaeLrDISbE2xkf1CkbyMbACNIyFUvSJl/SjtdmBIy0nPbs1cOg6Xn+XBNlVqdbvCjG7UW9dpBpeNR3hzr72Z/bQBVl0l3RFbT0Gt0Ti3ZMIPePgRKWeX2YglX7zs45UmfYQlxSM74MEHTxmrDKDVCVnzltGiSNg+c1aM0AY0KVVxCQUWAoW4lNEqiFVKjTQW+HotZqiTYtvGP2XurB3ZkDofRMSCMluE2y8FadoNJ68Ox0WeBaaGOiQDy8CyicNYH326nkiZ8Ujcmfq51Fbp31SKkYejlp7HqaEPxlV6CJ3JNEC92Lhp/51+rpHA1wC6TK+fsUIEA/vzZTb/5YFrjkpc1nAGxjvCtKV5zyiYc92FMIO20nxgYj6Y21O08MCAn37nd8p0HzBvvLrkedVSSOxotPsoapouI/ObKN7AQGL1N8c/C11pxWvx2S5YwqcOMR7oEOaG1Jy/O4u2GAFRnr/0k= nkarpin@nkarpin-home
user: ${linux:system:user:mkarpin}
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 17443e1..864e007 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -17,6 +17,8 @@
- system.openssh.server.team.members.deremeev
- system.openssh.server.team.members.mpolenchuk
- system.openssh.server.team.members.vmarkov
+- system.openssh.server.team.members.aarefiev
+- system.openssh.server.team.members.efedorova
parameters:
_param:
linux_system_user_sudo: true