Drop parameters:openssh:enabled key from all users

  * Those key, should be managed by higher class
  * Same for sudo option(make it always parametrized)
  * Move public_keys under user:public_keys

Change-Id: I52bac4d22fbdb36f02010d9e9997d1d2429ed8e3
diff --git a/openssh/server/team/members/mikhailkraynov.yml b/openssh/server/team/members/mikhailkraynov.yml
index a7a2d95..ca186ba 100644
--- a/openssh/server/team/members/mikhailkraynov.yml
+++ b/openssh/server/team/members/mikhailkraynov.yml
@@ -3,21 +3,17 @@
     system:
       user:
         mkraynov:
+          email: mkraynov@mirantis.com
           enabled: true
-          name: mkraynov
-          sudo: ${_param:linux_system_user_sudo}
           full_name: Mikhail Kraynov
           home: /home/mkraynov
-          email: mkraynov@mirantis.com
+          name: mkraynov
+          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
-      enabled: true
       user:
         mkraynov:
           enabled: true
-          public_keys: ${public_keys:mkraynov}
+          public_keys:
+          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDD2yg5tjwdg+SFPbcm+qIsrYjLcI3qbaqSInA+qY7oyLGj3nO0sC4Wj+6hOQIEzuxXtt7a88Y0ghQrYB5EB6RK7Q6Ll0vT7XdqdVoYiYiKIvaAk7rOt1hhfDb1ogVTXXs7dKCUKmJDMZnALOuh2UJHoRd3G4wyveInNBAHW6PqOIfU0PjEckjDuGhAmYSlawXebNxDgGOvk0TfsxUGiCN3JKKZ6w5956eub6/I+HWpMzZIB1oUsgtPfhTvFnA7vq7JxNVWUv/tXvSI0qKuOCZ+eH8n2/cWtrzOwRUptMGMS7oOMvwEil99BruuB8Xl5Um1iG8qd+H0gAfVeKMnuBkT
           user: ${linux:system:user:mkraynov}
-  public_keys:
-    mkraynov:
-      - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDD2yg5tjwdg+SFPbcm+qIsrYjLcI3qbaqSInA+qY7oyLGj3nO0sC4Wj+6hOQIEzuxXtt7a88Y0ghQrYB5EB6RK7Q6Ll0vT7XdqdVoYiYiKIvaAk7rOt1hhfDb1ogVTXXs7dKCUKmJDMZnALOuh2UJHoRd3G4wyveInNBAHW6PqOIfU0PjEckjDuGhAmYSlawXebNxDgGOvk0TfsxUGiCN3JKKZ6w5956eub6/I+HWpMzZIB1oUsgtPfhTvFnA7vq7JxNVWUv/tXvSI0qKuOCZ+eH8n2/cWtrzOwRUptMGMS7oOMvwEil99BruuB8Xl5Um1iG8qd+H0gAfVeKMnuBkT
-