Update/cleanup users in oss_team and k8s_apps_team

Change-Id: Ia430b676da36ef3e3428fcdb82b8fca202e427e0
diff --git a/openssh/server/team/oss_team.yml b/openssh/server/team/oss_team.yml
index d5ba940..68348f7 100644
--- a/openssh/server/team/oss_team.yml
+++ b/openssh/server/team/oss_team.yml
@@ -1,95 +1,12 @@
+classes:
+- system.openssh.server.team.members.mivanov
+- system.openssh.server.team.members.sskripnick
+# Deprecated users
+- system.openssh.server.team.members.deprecated.ikharin
+- system.openssh.server.team.members.deprecated.jkirnosova
+- system.openssh.server.team.members.deprecated.vkramskikh
+- system.openssh.server.team.members.deprecated.vstoiko
+
 parameters:
   _param:
     linux_system_user_sudo: true
-  linux:
-    system:
-      user:
-        ikharin:
-          enabled: true
-          name: ikharin
-          sudo: true
-          full_name: Ilya Kharin
-          home: /home/ikharin
-          email: ikharin@mirantis.com
-        vstoiko:
-          enabled: true
-          name: vstoiko
-          sudo: true
-          full_name: Volodymyr Stoiko
-          home: /home/vstoiko
-          email: vstoiko@mirantis.com
-        mivanov:
-          enabled: true
-          name: mivanov
-          sudo: true
-          full_name: Michael Ivanov
-          home: /home/mivanov
-          email: mivanov@mirantis.com
-        vkramskikh:
-          enabled: true
-          name: vkramskikh
-          sudo: true
-          full_name: Vitaly Kramskikh
-          home: /home/vkramskikh
-          email: vkramskikh@mirantis.com
-        jkirnosova:
-          enabled: true
-          name: jkirnosova
-          sudo: true
-          full_name: Iuliia Aranovich
-          home: /home/jkirnosova
-          email: jkirnosova@mirantis.com
-        sskripnick:
-          enabled: true
-          name: sskripnick
-          sudo: true
-          full_name: Serhii Skrypnik
-          home: /home/sskripnick
-          email: sskripnick@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        ikharin:
-          enabled: true
-          public_keys:
-          - ${public_keys:ikharin}
-          user: ${linux:system:user:ikharin}
-        vstoiko:
-          enabled: true
-          public_keys:
-          - ${public_keys:vstoiko}
-          user: ${linux:system:user:vstoiko}
-        mivanov:
-          enabled: true
-          public_keys:
-          - ${public_keys:mivanov}
-          user: ${linux:system:user:mivanov}
-        vkramskikh:
-          enabled: true
-          public_keys:
-          - ${public_keys:vkramskikh}
-          user: ${linux:system:user:vkramskikh}
-        jkirnosova:
-          enabled: true
-          public_keys:
-          - ${public_keys:jkirnosova}
-          user: ${linux:system:user:jkirnosova}
-        sskripnick:
-          enabled: true
-          public_keys:
-          - ${public_keys:sskripnick}
-          user: ${linux:system:user:sskripnick}
-  public_keys:
-    ikharin:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0NNCF9Orei3Ls5wa7xNH/2nl4eAUYY/vuAers7as8lQXjUXkurLQUG1YTQhuRiqyLrqLZjokq87l3LcpXsiBaqNybwlg4OAcf7p59FwDwdpCcAfoHeP03vt/FOYgozeExIRxVNHMdZjQJ4o5j75vnwTfGIubSF1eUOwtRVeezAREK1OPA2TRvlSOXCsAinNSZHBFTlYVYIXQEk/zuH7PdwlU2rkN69mNivh1tAUDlhrwZHrR9rcudafp5s3C5MKFtI3W4MhYIqv9ZViEhLwfEhNb0WXiUv+sdGTf8jTcXaYOlw6z9A76Ab/9bfPyOTmI7tli8Pz15+YPj1ymdlIZlQ==
-    vstoiko:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDF13qwUbb+lva8KCNE6IppajmGfF3MJIFhIPD7HYwzeIyI3INlc6nMMOk+r4a6IO3okVxgqRi27boebvUpazw0Jw4T4e1oLQpWCxvhTZkukFsrd9DJiCj07VXluua2ofaCRLCSHVLdjAH4WocmZeCXpZF1ldDeNBeuX0iYJiFBslrG/pmOuCm3IEL7GmoIJjF0Idtwo3tkWcvCUXKvBaVqCHS34Q/KJLAvZc95MLESs/kdnhfxhxbpWrRRFcZn/zIxuuptuTBzWOPd7CnsOLo5PCnuxIfDznDYYzQUJq6OmwMZipepTtymXUvFQiqq7xc/HmNR51vowqwoftgHNxYvoaQgXkneWFnq4Cl9WZaLVs90wNgQewPaKmhL8ia1S2C3Cub0ILsbU/091L7adBeZI87pkfx72HhFQRUOcVprgPAEKKTbEvUQKAQ4rZ6GOIU5Tz/fKf1sXLhiTEAgpGpaTyyTP04vpgP5iY4kcXQHpRsPxg1BQ+93S3KqF2XAdXvrA4eZfAHmGhsAOePdnJQZVf8c4exsgkIGEyM9Wgi2ZWlq7oY0tFJLf+Kq7y23QuC6isIqBBIDN/TtmHRpiWNY4zwmGhzSxBdA6zMVy9PblrU71w1xVBS4KKwUqbWbP06pA7V04sp8kGKz5OmN9Z+rdTQJ2v41SSU71kT6XSFFOQ==
-    mivanov:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLY+5Yc3MMOmxVGrBmvfMX9bwK98RdgW+9E/rj56rh1w5cuIy5qN0xsuU4634EcSLRUjGXBcutDXPEXV1s7BZfeZjXJri37RICLsKfvPZcyiEqtwTbGYkcDDOHH0nmZdfngi0r/qAc5o5k3KA7Eh4CJW+GgqPoShngCKo9YKqbWFUkrGpX7wIUMlqwyuVKsybxD6EU+CB3RAeASG4E0rRq7VYQaTj/+PQq8VrWGUs9QHW8wX+OakDDCI7Or4Ll5q/uPCopaU9r7yz+uEYA1L8P2wEJ4XG9V6dxUMvzrFLBE+wDrHHXcEZMWGbmrPHUy5Yt8UCFPgtYfOl2BvHHHUSp
-    vkramskikh:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9eVOmPT/jCS/q/+T5EmKIBol3wovE+qTb4SQI4y9ZUIT+tMGult1dheqXVKIMYdTe/cccPTf5A+b6QpkPEjzQQljn0qmyHM75ya+Gjd3uTWx+1VXSFL42p0+404oVkB+eOtax+Bf8CU14P6sJn+3ypO63VVCJz6V2cgkr14tqkMZb+4OBPJB6zrNAfXhNJlJ8fLV4d5c4guin74hoaor5VIER3hwMPIe0CtudzdjcdDDvVNqXYfoknwMTNR52h1Zfwvomsy5pdFcI5sQKaOxSqWyi3C22yu/ZK0Diq82INskZ1vjHiJHw8QguXLzevCK4BECnjDFr6Hu4J6eRK3YJ
-    jkirnosova:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuW6hvLo7eRwm6WcjJEDW7TsLG2rZrtmffHQ58c4AzlLAxV0tkvvfQRS4f5Pb+Wj1flxt+RW2rq4dSkQCpwNnYdTHHRnQJFJQEAouqNF7cTVrprioXNeoBe8DGVHiUUI8IpeN8hJYQw17NB6hf8oZulZqdZZ9DA7uwnC0HFfQ1E4MuFnfhB0/XyzJMsxrxHyjte+cOdgE9F43ccHInBGowrzOJP8AUdWdC0I2WU0sjvQrGcvlHr7/EqPP1Zh7PblwESyf3muas7iFTCKtCbXM+pT3e687++ueCqrAftVZGCPpXe23U3sSGdiIti0L6CYxBI02VKlsQgfSqWd8z+W1T
-    sskripnick:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbDedH7Aw1g2LDHrCLpxfq5GsdTpqRglDXy9dDSEr08tVVl7gSzPJ5oMlIr9VsNVHsR9vf/THhxghFrV1rQZDny8c6yLqus3Upc7pJfOUztWD4+E29H7qJOafrnuNRHGFaEiaG6aZm3WyyvAdlR1lh/i5zQtdrPBmjYkq5LMJvNQBpj4XqmHYp7gLRNDI30Ne49xxAIGC1Qbx0Xvhmq9/h4gZhI5mB/QeOj4tPcd7g+kSTdc5/fXbBLeQDBZt/HlDr7/LFjYZ4OBumVDOTfClFO5UoIAvHyfysaiWI/qZ7UZI7uU4yAPeI8/s/INOQOIoiqaHyiVnL5BvFklHldMot