Merge "Pin cvp-sanity-checks:2019.2.11 docker image" into release/proposed/2019.2.0
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 1083466..8bdca1b 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -25,7 +25,7 @@
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.10"
+ opencontrail_docker_image_tag: "2019.2.11"
# stacklight
# locally forked v7.4.4, updated 2020-08-06
docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta:2019.2.11"
diff --git a/jenkins/client/job/ceph/remove-osd.yml b/jenkins/client/job/ceph/remove-osd.yml
index bff0d75..ce2037b 100644
--- a/jenkins/client/job/ceph/remove-osd.yml
+++ b/jenkins/client/job/ceph/remove-osd.yml
@@ -47,4 +47,7 @@
type: boolean
default: 'false'
description: Clean data/block partitions
-
+ CLEAN_ORPHANS:
+ type: boolean
+ default: 'false'
+ description: Clean data/block partitions
diff --git a/openssh/server/team/members/mpolenchuk.yml b/openssh/server/team/members/mpolenchuk.yml
new file mode 100644
index 0000000..eafbe84
--- /dev/null
+++ b/openssh/server/team/members/mpolenchuk.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ mpolenchuk:
+ enabled: true
+ name: mpolenchuk
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Michael Polenchuk
+ home: /home/mpolenchuk
+ email: mpolenchuk@mirantis.com
+ openssh:
+ server:
+ user:
+ mpolenchuk:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC18NFHig4QQPBgFY7s3MOzGRYHOFY6Fzu1lBSYoH6Ie6u2AY7aS149uSUHJPuzTQ5uEsxXqSlfOOggwrB7sOb1w+sCUhUJN5SyvPl1tnQ5mQ96DvMGtFwuTQwQJ5SY/XXIKCKn59G0AMyOmajDsHdeUFhwj1u8CWnEM7QHxuAxDxbExNyWe0yytsdbIelI1xsyX3qWNsJz/9BSnD6IKKtB0ca0lG+qWmO8eQ/A/pqE28E6kh25mqsEk38gTvBgJsaociU75WTEQYcxhVy4+/ZoZeW/ASDC+Raaq8b7gbrOo8EKdgpWk1MAdomfGfoxJ2HEVI08vLR3xBd0IjbC0NFN root@desktop
+ user: ${linux:system:user:mpolenchuk}
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index b2ef7eb..a46f242 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -14,6 +14,7 @@
- system.openssh.server.team.members.pshchelo
- system.openssh.server.team.members.obryndzii
- system.openssh.server.team.members.dteselkin
+- system.openssh.server.team.members.mpolenchuk
parameters:
_param:
linux_system_user_sudo: true