commit edef0dd157a9453209cd7d241c5e387e6d2691b3
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Dec 16 14:16:44 2020 +0000
committer Gerrit Code Review <mail@domain.com> Wed Dec 16 14:16:44 2020 +0000
tree c4b68384de78fff8f4854fe0c92408aa175a41fb
parent b6e724e90ef808c9606d038327e31633bbdacc81
parent cd54092796ab427ffc0cd9f28ee7d4c26a13edf5

Merge "Bump cvp-sanity-checks image" into release/proposed/2019.2.0

openssh/server/team/members/srogov.yml

diff --git a/openssh/server/team/members/srogov.yml b/openssh/server/team/members/srogov.yml
new file mode 100644
index 0000000..ae6b4a5
--- /dev/null
+++ b/openssh/server/team/members/srogov.yml
@@ -0,0 +1,19 @@
+parameters:
+  linux:
+    system:
+      user:
+        srogov:
+          email: srogov@mirantis.com
+          enabled: true
+          full_name: Stepan Rogov
+          home: /home/srogov
+          name: srogov
+          sudo: ${_param:linux_system_user_sudo}
+  openssh:
+    server:
+      user:
+        srogov:
+          enabled: true
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjlSWDL7hIgLbklKBVXIyNKxi3U4cbUSxPDFgUAf1Fp0mz/6o5jUuJjGMVtAYvQFBQbi8Hn0wX2bdubyFnD21M+9jQL05fqQGsG/JPq+u/XYj+k+WVLyrjTWMoL4xs9vAwjAJfDaWZ4BDwfWCAVe86OzjuFo2LvDl08YJpLTwwCqpUR9htvZGxR9UvJr7JV2xNqD9xUl3TK0n9Fo0aWbWiszImRO6KLRASKw8x0GgNjzP5qGI02x34tW9nL1yTjRxMweVyyh91OWdGLTp1ghixb2ZRJWPQ99UaWKv0pGCBbyjjmQCmODffSstIcFpGmqqZ8Y6aP6ESOYPXJccAvc0/ chlorum@chlorum
+          user: ${linux:system:user:srogov}

openssh/server/team/services.yml

diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index ba29eb9..c3a6f07 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -14,15 +14,13 @@
 - system.openssh.server.team.members.osavatieiev
 - system.openssh.server.team.members.pbasov
 - system.openssh.server.team.members.pruzicka
-<<<<<<< HEAD   (cc12a4 Pass in Alerta authentication details for Alertmanager to se)
-- system.openssh.server.team.members.qwu
-=======
 - system.openssh.server.team.members.pvaylov
->>>>>>> CHANGE (5ede29 Adding Pavel Vaylov)
 - system.openssh.server.team.members.sburns
+- system.openssh.server.team.members.srogov
 - system.openssh.server.team.members.vkuspits
 - system.openssh.server.team.members.yisakov
 - system.openssh.server.team.members.wnawrot
+- system.openssh.server.team.members.qwu
 - system.openssh.server.team.members.srudyka
 parameters:
   _param: