Merge "Add Jenkins prefix url variable for running pod"
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 342c55f..2457920 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -46,6 +46,7 @@
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:${_param:mcp_version}
+ docker_image_cvp_shaker_checks: ${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:${_param:mcp_version}
# aptly
docker_image_aptly:
base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:${_param:mcp_version}"
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index f15b370..43bc5e2 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -85,6 +85,8 @@
- method java.util.stream.Stream collect java.util.stream.Collector
- method jenkins.model.Jenkins getItemByFullName java.lang.String
- method jenkins.model.Jenkins getPluginManager
+ - method org.apache.commons.net.util.SubnetUtils getInfo
+ - method org.apache.commons.net.util.SubnetUtils$SubnetInfo getNetmask
- method org.jenkinsci.plugins.workflow.job.WorkflowRun doStop
- method org.jenkinsci.plugins.workflow.job.WorkflowRun finish hudson.model.Result java.lang.Throwable
- method org.jenkinsci.plugins.workflow.steps.FlowInterruptedException getCauses
@@ -110,6 +112,7 @@
- new java.util.Date
- new java.util.HashMap
- new java.util.LinkedHashMap java.util.Map
+ - new org.apache.commons.net.util.SubnetUtils java.lang.String
- staticField groovy.io.FileType FILES
- staticMethod com.cloudbees.plugins.credentials.CredentialsProvider lookupCredentials java.lang.Class hudson.model.ItemGroup
- staticMethod hudson.model.Hudson getInstance
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index d24db10..2165637 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -16,7 +16,7 @@
keep_num: 50
artifact:
keep_num: 50
- concurrent: false
+ concurrent: true
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
@@ -32,28 +32,10 @@
type: string
default: "3"
description: Job timeout in hours
- RUN_RALLY_TESTS:
- type: boolean
- default: 'true'
- description: |
- If chosen, Rally tests will be executed. Please set K8S_RALLY='true' if you plan
- to test K8S cluster with Rally framework. Special K8S plugin has to be utilized
- RUN_TEMPEST_TESTS:
- type: boolean
- default: 'false'
- description: If chosen then Tempest tests will be executed
- RUN_SPT_TESTS:
- type: boolean
- default: 'false'
- description: If chosen, SPT tests will be executed
TEST_IMAGE:
type: string
- default: 'xrally/xrally-openstack:latest'
- description: |
- Docker image to use with required test set. Please use
- 'xrally/xrally-openstack:latest' - for Rally tests
- "${_param:mcp_docker_registry}/mirantis/oss/qa-tools" -
- for SPT/Tempest environment setup
+ default: "xrally/xrally-openstack:latest"
+ description: Rally docker image to use for running tests
TARGET_NODE:
type: string
default: ""
@@ -68,7 +50,8 @@
description: Credentials to the Salt API
VALIDATE_PARAMS:
type: text
- default: |
+ description: YAML of parameters for Rally test
+ default: |
---
rally:
# Name of availability zone
@@ -110,34 +93,6 @@
REPORT_DIR: '/root/qa_results'
# Scenarios names/dirs to skip
SKIP_LIST: ''
- tempest:
- # Set of Tempest tests to run (smoke,full)
- TEMPEST_TEST_SET: 'smoke'
- # Git repository with configuration files for Tempest
- TEMPEST_CONFIG_REPO: ''
- # Git branch which will be used during the checkout
- TEMPEST_CONFIG_BRANCH: ''
- # description: Git repository with Tempest
- TEMPEST_REPO: ''
- # description: Version of Tempest (tag, branch or commit)
- TEMPEST_VERSION: ''
- # If chosen, run HTML report will be generated
- GENERATE_REPORT: 'false'
- spt:
- # Name of availability zone
- AVAILABILITY_ZONE: 'nova'
- # External(floating) network name
- FLOATING_NETWORK: 'public'
- # Username that is used to ssh between cluster nodes
- SPT_SSH_USER: 'root'
- # Image that is used for network-VM-to-VM-iperf-tests tests
- SPT_IMAGE: ''
- # Username that is used to ssh to SPT_IMAGE
- SPT_IMAGE_USER: ''
- # Flavor name for SPT_IMAGE (make sure you have required flavor created)
- SPT_FLAVOR: ''
- # If chosen, run HTML report will be generated
- GENERATE_REPORT: 'false'
cvp-sanity:
type: workflow-scm
name: cvp-sanity
@@ -437,7 +392,7 @@
param:
IMAGE:
type: string
- default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:${_param:mcp_version}"
+ default: "${_param:docker_image_cvp_shaker_checks}"
description: Docker image to use for running Shaker.
SALT_MASTER_URL:
type: string
diff --git a/openssh/server/team/maintenance.yml b/openssh/server/team/maintenance.yml
index 110b085..1017578 100644
--- a/openssh/server/team/maintenance.yml
+++ b/openssh/server/team/maintenance.yml
@@ -6,6 +6,7 @@
- system.openssh.server.team.members.dtsapikov
- system.openssh.server.team.members.rlubianyi
- system.openssh.server.team.members.msamoylov
+- system.openssh.server.team.members.pglazov
parameters:
_param:
linux_system_user_sudo: true
diff --git a/openssh/server/team/mcp_ci.yml b/openssh/server/team/mcp_ci.yml
index 829839e..4bdf615 100644
--- a/openssh/server/team/mcp_ci.yml
+++ b/openssh/server/team/mcp_ci.yml
@@ -1,67 +1,9 @@
+classes:
+- system.openssh.server.team.members.dburmistrov
+- system.openssh.server.team.members.sotpuschennikov
+# Deprecated users
+- system.openssh.server.team.members.deprecated.dkaiharodsev
+- system.openssh.server.team.members.deprecated.rkamaldinov
parameters:
_param:
linux_system_user_sudo: true
- linux:
- system:
- user:
- rkamaldinov:
- enabled: true
- name: rkamaldinov
- sudo: true
- full_name: Ruslan Kamaldinov
- home: /home/rkamaldinov
- email: rkamaldinov@mirantis.com
- dburmistrov:
- enabled: true
- name: dburmistrov
- sudo: true
- full_name: Dmitrii Burmistrov
- home: /home/dburmistrov
- email: dburmistrov@mirantis.com
- dkaiharodsev:
- enabled: true
- name: dkaiharodsev
- sudo: true
- full_name: Dmytro Kaiharodtsev
- home: /home/dkaiharodsev
- email: dkaiharodsev@mirantis.com
- sotpuschennikov:
- enabled: true
- name: sotpuschennikov
- sudo: true
- full_name: Sergey Otpuschennikov
- home: /home/sotpuschennikov
- email: sotpuschennikov@mirantis.com
- openssh:
- server:
- enabled: true
- user:
- rkamaldinov:
- enabled: true
- public_keys:
- - ${public_keys:rkamaldinov}
- user: ${linux:system:user:rkamaldinov}
- dburmistrov:
- enabled: true
- public_keys:
- - ${public_keys:dburmistrov}
- user: ${linux:system:user:dburmistrov}
- dkaiharodsev:
- enabled: true
- public_keys:
- - ${public_keys:dkaiharodsev}
- user: ${linux:system:user:dkaiharodsev}
- sotpuschennikov:
- enabled: true
- public_keys:
- - ${public_keys:sotpuschennikov}
- user: ${linux:system:user:sotpuschennikov}
- public_keys:
- rkamaldinov:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCzeIFxatNuXWuaTomcGDTMlpqiF6KlK47BSO5yIpfWHTL7o0OFsQArB4UeZ9AC7JHQg1bpxzscJxz8Xj3tA1f8yOCrepR8LbWh7L6a1hMhSCJPK9QLUHPCLV4PW0ghq46Um8ekxMbEqGM/rrKP+GeYxNFUxJMHCkKbZAsV+BV8amuJHQkYt29GP/hgYyZEoWKErqoQ/uGQ0qWEMVQsnus6M3p3c/v1J4JtbbrmRBjyrPx/Tjinw6K2sgocgBZT7vVb4PYwbONi1IAclkPJIyrSNEavZ4MbK93ZXNQCV7rkUbKmHT71Qle34/ks9zyERJ3RgB+pWgQqCjtmJeV51V1 rkamaldinov@mirantis.com
- dburmistrov:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPKldN0BL6C/pmjkKyaSUw9OTUQAumWLCgNPyLVGZIuYPyFs9GqvKgHVm0QChm1OLhnQuA1wxGW5piBtqaDCTyLbKb/ANR3nhO1rqX5LTwZS2W2I0ImP47HUpnxqsBl15/y9hY2JDHZ7qrd7zNqCD+uCkf9l9qA9BmN1aMSKm07fqaaUfhnl3AocxsPX4X4eHfzy7hPJdzrHEcHbGoLLEd8ahJLkHKieWF1lAI++fIhETPF41+ZbH7MBBG4qw/UhhYAgLP3YAEWwvm/J3DtRqGkpSvH2U21hmAlgJHwxtoCD9Q1jKpH5+BDTvqJIXu0K7Gcl00xbeNYyHrwTVsldFX dburmistrov@mirantis.com
- dkaiharodsev:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSz9eH08GDUOSEDReJAIdjDCoYaoTwg1SSzYNwPRO/evJBeqYwRvZmxzITKq+1qy4jXnpa3ZpuBdaUebqKri2VtvMGmBrWtP8Ojbg3kNPjKOfvrW4cCyJE0yrnW03TULnRgrnf4/WXLK0dnHxL39AmlVjQTVS4pbx73XjyPoVjJbk4PXq37F5cLyyLj4aeWmCcPWn7MLsEC4RUkDwHy3DsDNdgKOlUSHmmOfVy9GBwVbXwVyYbq732Qm0Qqf/2zlJi84LgXOH2irv5HRTMDQ2Wey5Amcl7VpK8OMvtN4R8Sb7c3mgsmM/b/h+gefl0Y/vQfsSSi8GCPhmBoNT4FBgZ dkaiharodsev@dkaiharodsev-pc
- sotpuschennikov:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO/nNs4MF5ZOCooLxF+zrxVmuJa9URzAqIQG5eZkhWvSAnrYREN15BN6dlcixA+Ro4YsHY6iSHzsaanr8onNu89yZdCkHIqLZ8+DcBefpoVXcsLZzeXwNNqr9sUjHEJCTesI5dJcEe/222LjwzAdTW1Xv/o3mgVAwt+4XsQ2IPAlxl3LfJOlCQdC/0sL5FMFX6LwMonLBss3B/J45atXgPL1Dx9WKTP0QrJHaX+vh+Xj2PK9yXcB2hJhFP0IULmUqGkYgDw/mh2DiHSiCQUPGZDo49MIw4WqEwqpQKcJGjD0Ihy2pjzwI9ZUzCNWe+bUcqDdl/9SH4YsNbfaK4Te6H pers@sotpuschennikov
diff --git a/openssh/server/team/members/dburmistrov.yml b/openssh/server/team/members/dburmistrov.yml
new file mode 100644
index 0000000..adcdafb
--- /dev/null
+++ b/openssh/server/team/members/dburmistrov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ dburmistrov:
+ email: dburmistrov@mirantis.com
+ enabled: true
+ full_name: Dmitrii Burmistrov
+ home: /home/dburmistrov
+ name: dburmistrov
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ dburmistrov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPKldN0BL6C/pmjkKyaSUw9OTUQAumWLCgNPyLVGZIuYPyFs9GqvKgHVm0QChm1OLhnQuA1wxGW5piBtqaDCTyLbKb/ANR3nhO1rqX5LTwZS2W2I0ImP47HUpnxqsBl15/y9hY2JDHZ7qrd7zNqCD+uCkf9l9qA9BmN1aMSKm07fqaaUfhnl3AocxsPX4X4eHfzy7hPJdzrHEcHbGoLLEd8ahJLkHKieWF1lAI++fIhETPF41+ZbH7MBBG4qw/UhhYAgLP3YAEWwvm/J3DtRqGkpSvH2U21hmAlgJHwxtoCD9Q1jKpH5+BDTvqJIXu0K7Gcl00xbeNYyHrwTVsldFX dburmistrov@mirantis.com
+ user: ${linux:system:user:dburmistrov}
diff --git a/openssh/server/team/members/deprecated/dkaiharodsev.yml b/openssh/server/team/members/deprecated/dkaiharodsev.yml
new file mode 100644
index 0000000..9fb83de
--- /dev/null
+++ b/openssh/server/team/members/deprecated/dkaiharodsev.yml
@@ -0,0 +1,16 @@
+parameters:
+ linux:
+ system:
+ user:
+ dkaiharodsev:
+ email: disabled
+ enabled: false
+ full_name: disabled
+ home: /home/dkaiharodsev
+ name: dkaiharodsev
+ openssh:
+ server:
+ user:
+ dkaiharodsev:
+ enabled: false
+ user: ${linux:system:user:dkaiharodsev}
diff --git a/openssh/server/team/members/deprecated/rkamaldinov.yml b/openssh/server/team/members/deprecated/rkamaldinov.yml
new file mode 100644
index 0000000..de65cad
--- /dev/null
+++ b/openssh/server/team/members/deprecated/rkamaldinov.yml
@@ -0,0 +1,16 @@
+parameters:
+ linux:
+ system:
+ user:
+ rkamaldinov:
+ email: disabled
+ enabled: false
+ full_name: disabled
+ home: /home/rkamaldinov
+ name: rkamaldinov
+ openssh:
+ server:
+ user:
+ rkamaldinov:
+ enabled: false
+ user: ${linux:system:user:rkamaldinov}
diff --git a/openssh/server/team/members/kalmog.yml b/openssh/server/team/members/kalmog.yml
new file mode 100644
index 0000000..d4f7ceb
--- /dev/null
+++ b/openssh/server/team/members/kalmog.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ kalmog:
+ enabled: true
+ name: kalmog
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Karen Almog
+ home: /home/kalmog
+ email: kalmog@mirantis.com
+ openssh:
+ server:
+ user:
+ kalmog:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbyRCfyI5STokPerwEDC1DQobZTxbg60bST87dc4Wnm3PY7qciGUgLR5CLR3olxsG+OyqbloXg/YZPh/rlDPZMuanxdpZOz1CRPUfF7s/+sISDOVkA2HOfGWOa8+f2SIHUM5PDgCim9hJ7SkKN3OGdBZS/DM8byjx7hDh6vd/KnoJR8M2plzr/xWkz1TwgL/S8mvB1HcnfWcGH+JatweMTSBNW0f/qwI5V2pRFyjKlSjZdDJzORMT4mbTveyZfbJP6nJe0cNrZDmKqa9kcjjxUGtLpEi+8HRLavBhet5DHrgBAzlXL5WR3H3ESSeee9I7rqhIW/zhcG3xmE7tJh9+z7ZZghhQq1iqvjgtmEXplC1CnhTkEDdtB39FrWDpJYOZb6/pP3bHTHxhSwxg1kCX1nYN+ugUOKB6UKYK9HP1teagd4bQ4dY5QCEs70av/cDdLWQxagGGDIgcHV9gR8T+MHazmhBFSzxk/eVkxo9ype2EbbIdQjUFclzGiImY1kpPx00k1XgwCIILuePJD84qizwLfAsb73r+UG4I5XWdhgCDa1VD3rOOgihQ7x2bciWgWyXzWG8O1kmBMZ92YjMpVQqlCpJVqhT2DJOR+eqYzuSaaYYnhRL2eb45kYaJVK/XzoJlDj4cVwdJzoNEFrrQkoxLHTkcf2vTYqTYjKZeIJw==
+ user: ${linux:system:user:kalmog}
diff --git a/openssh/server/team/members/michaeltillman.yml b/openssh/server/team/members/michaeltillman.yml
new file mode 100644
index 0000000..45e28e7
--- /dev/null
+++ b/openssh/server/team/members/michaeltillman.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ mtillman:
+ enabled: true
+ name: mtillman
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Michael Tillman
+ home: /home/mtillman
+ email: mtillman@mirantis.com
+ openssh:
+ server:
+ user:
+ mtillman:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrwIE+mNdIpNET0s4xKIWWvHjLObHR5Uc8HAZpq5U+CZyvsV9BNQUXynZF4oV68K22exkUyUPWXEI4rTrSf9BdBzla4xCTOEDbVUQ6b7RKopqQiitHT9LW4HDxvHtPX+svJ6xho7QwGZjPbQ2k7O5YMB9/ZjAuTzQHsDCWiMoY7OYujWt2SpeK9mHZQG247iPQOHMA9/cnu7CgpBoDN6NRli2kkExNeDArTB418NZTFBDYvv2c/TDk5z8HD87QciOqFwoD5j27hv4UylrtHWKkam2EPGbf3opWUqDxwyVOb++2+BXrVdHzARVnKuyWOB0dyIjXXsP0LfqL6mbtk+jN
+ user: ${linux:system:user:mtillman}
\ No newline at end of file
diff --git a/openssh/server/team/members/mrasskazov.yml b/openssh/server/team/members/mrasskazov.yml
index 825c150..2a5a137 100644
--- a/openssh/server/team/members/mrasskazov.yml
+++ b/openssh/server/team/members/mrasskazov.yml
@@ -15,5 +15,5 @@
mrasskazov:
enabled: true
public_keys:
- - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCysPXCuMbUjqjtO/n0jVZK13/uMA/TI6Qsdyciih6jWJLbd6FCL/GWvkykngLHGH9lVGFYsOPRiAmlh8gXfYohCZFYuHxE88GoiycvJGRGoBDdxd/beDca6nP4Peqlg3TUUum9PefULDiv3eVHKwX4BC9mGIR6bWB41O003OxJMwEN9lLGmWqxAlAdCUwRIm9TlgTu6Fq3ZIkjSwGsZg4E+saBLnUiOjwYWSwmTiB8WTR2b19lZhXFEovdVY3/gF8Td84WT1TDXeWBAvwmAcFLRPEx/AI1Nt4AhM1toMMoq64pYbGCOYSgI7DZR/2vtxGa0IjQclLZ+M8YktyNErc9
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4Bq2NQlTLLXUZapAx1R7glnJHchDV+zo/6GPSLKYjDJduTqcd+K9K5Q4n15Nvst97vI7AJRxVIhuLgByIPhCb4M73AGrj/9kD3NBy+fSEqL4/BSAz2HSnP88Z8gJS5PaePx0ze8aduPKIoBiX/qN90VaIG4yOthfdt7L6odpm+WhbcauOI87Tdp6WIQ29hDVrdj+4XzD5WJ36il5bxTia0mJohy8BZzIkuwpbOX5UV6+E8cuPRwFmFVdezOUsCLF6uvcMHwMVgyZ243oZdH+33E0FQ60pzcMgc/drhlQg7SsYxosqOoX8BXn7uLo3YMftRNJrp6cEK3vo8dgnEx59 mrasskazov@mirantis.com
user: ${linux:system:user:mrasskazov}
diff --git a/openssh/server/team/members/mvollman.yml b/openssh/server/team/members/mvollman.yml
new file mode 100644
index 0000000..a024a59
--- /dev/null
+++ b/openssh/server/team/members/mvollman.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ mvollman:
+ enabled: true
+ name: mvollman
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Michael Vollman
+ home: /home/mvollman
+ email: mvollman@mirantis.com
+ openssh:
+ server:
+ user:
+ mvollman:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHxIRMQtpFHzKPCMe+pXJC3JrW3RiHyqU8XEDFXrhYsKG3TyDzMUktailF03QaVFfUTifQH5fMavnfJENV7syngoo8VL7Qm3wdvKbcCRczNKxiDIhQb1uCnQcKA2VA7ywDyyvtuQHxptx3G2D7B781/zugBNrkjhiyyUuSFzDHkqjWwRYm7wCEzMgzHeKbyXz3qCblp6CsSvOFreG/7tRGJFvjmY7+FENXN8uMeK4NPVeXIUNGI068EzpZPvEeMCzpYNRF9CPdkz5rF9/EsyljSSx5Ymb2RfDZshjaEE9LOF7k1VXM0DzXYBsz7XVP7B5/JxumQRYpyqPMZoDoojN1 mvollman@1308-MBP13
+ user: ${linux:system:user:mvollman}
diff --git a/openssh/server/team/members/pglazov.yml b/openssh/server/team/members/pglazov.yml
new file mode 100644
index 0000000..ebf7b7c
--- /dev/null
+++ b/openssh/server/team/members/pglazov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ pglazov:
+ email: pglazov@mirantis.com
+ enabled: true
+ full_name: Pavel Glazov
+ home: /home/pglazov
+ name: pglazov
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ pglazov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhZxqF+NSuP+Dr2nmGHf4NIpH2xWSmq+UE/HGP6j81rKSBZeRb2SuRXLtLVh3NZ+3GLa4UQGvedcnsqzgvSt05LYujloHnLxIsrsOWbLxOcdUYkorhXenGKBxKopwViRNV2PovMAnwyZ27GkXH8RQ52XISOdTIIV7r8M3kLpxCor2jHnOzJOcr7rhLeSFTK5zw6//T3S+IOQ5/HEs+8NK1sNw2lxBTuk+dAydiaCsQqm4GMl5vZSy0j7cnsy+lq69zN2/Bi4JzKLDKF2ap4zDh/ELhUBoQhh12T0djFV9Qv9fTWI4LUW8cVyqxbfreJrZqSAyMgSRrGSUBclFTmn5Z pavel@pavel-All-Series
+ user: ${linux:system:user:pglazov}
diff --git a/openssh/server/team/members/sotpuschennikov.yml b/openssh/server/team/members/sotpuschennikov.yml
new file mode 100644
index 0000000..50bc471
--- /dev/null
+++ b/openssh/server/team/members/sotpuschennikov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ sotpuschennikov:
+ email: sotpuschennikov@mirantis.com
+ enabled: true
+ full_name: Sergey Otpuschennikov
+ home: /home/sotpuschennikov
+ name: sotpuschennikov
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ sotpuschennikov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO/nNs4MF5ZOCooLxF+zrxVmuJa9URzAqIQG5eZkhWvSAnrYREN15BN6dlcixA+Ro4YsHY6iSHzsaanr8onNu89yZdCkHIqLZ8+DcBefpoVXcsLZzeXwNNqr9sUjHEJCTesI5dJcEe/222LjwzAdTW1Xv/o3mgVAwt+4XsQ2IPAlxl3LfJOlCQdC/0sL5FMFX6LwMonLBss3B/J45atXgPL1Dx9WKTP0QrJHaX+vh+Xj2PK9yXcB2hJhFP0IULmUqGkYgDw/mh2DiHSiCQUPGZDo49MIw4WqEwqpQKcJGjD0Ihy2pjzwI9ZUzCNWe+bUcqDdl/9SH4YsNbfaK4Te6H pers@sotpuschennikov
+ user: ${linux:system:user:sotpuschennikov}
diff --git a/openssh/server/team/members/vkhlyunev.yml b/openssh/server/team/members/vkhlyunev.yml
index dce6e28..e7d8cfb 100644
--- a/openssh/server/team/members/vkhlyunev.yml
+++ b/openssh/server/team/members/vkhlyunev.yml
@@ -15,5 +15,5 @@
vkhlyunev:
enabled: true
public_keys:
- - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1v5pWSan9H2Wl64C8bKWmbULp0QgJUi9FqPyuw1bfS5GfHLxejPxaDzec0uSx0PXWzS9afwIO7aGA1dg+dvdl1iPy9jfpkQbGGsusmSsbLvf6+WLVsPk90Bvoc4anmEsG2DWT1SGR65d/imjlwsnlbHTQIm0YucjDjV/p2MmYlbaFLm+ynfo9mt1mP954GDPKQHvyBpxvAIEHL3xAcnNXcpSXm2jhCNsNGUSpY+R7gin2q8MtrpzQNeZZ8degUMpgba7CTXN1sws2dc3UayJ8KZkyRVJNk6mpt2jey03izJzXzt3ux3hg5lToELvEIMDdHOPHT0b0U7f2H+eBCfH/ vkhlyunev@cz7317
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDeGiSOs0zAwcxuc9y6BzidYFXQXLOLcBKSoW1tPYJ+bVGRwNRVh63/+/X+eOPbBp6xTNNHVyOpYHt1WUbIHsAqAx/XbzBp+j3/4+8+ucvWR3X9TTxK7Q+oB3SSy2iEeimiJmxfjiHu1hfcgN8L9YvXVquGC/EZbk/r27j7Gcxli7zesr9/kBBhigDSQeehJBJZ0ux3luVkjWSDYTeKqZhNNPFoD6eWmOfsAKNMhe/8IRD9e0zY4MsELi1tZl2zoQ69249e4M1aCuGxm+t+tHLzywX0tVZmM1yX7TDuszHbiii8HrjNwB1/K80HRwRrwVIne9P7wFSlC2exLkdfWd2D vkhlyunev@vkhlyunev
user: ${linux:system:user:vkhlyunev}
diff --git a/openssh/server/team/presales.yml b/openssh/server/team/presales.yml
index bb26682..770e549 100644
--- a/openssh/server/team/presales.yml
+++ b/openssh/server/team/presales.yml
@@ -7,6 +7,7 @@
- system.openssh.server.team.members.andreidanin
- system.openssh.server.team.members.danielvirassamy
- system.openssh.server.team.members.srichowdhury
+- system.openssh.server.team.members.michaeltillman
parameters:
_param:
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 65e3cb1..9c74edb 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -25,6 +25,7 @@
- system.openssh.server.team.members.isviridov
- system.openssh.server.team.members.cdodda
- system.openssh.server.team.members.lmendes
+- system.openssh.server.team.members.kalmog
parameters:
_param:
linux_system_user_sudo: true
diff --git a/openssh/server/team/storage.yml b/openssh/server/team/storage.yml
index 075b9d1..f22cbf9 100644
--- a/openssh/server/team/storage.yml
+++ b/openssh/server/team/storage.yml
@@ -1,3 +1,4 @@
classes:
- system.openssh.server.team.members.akiseleva
- system.openssh.server.team.members.mlos
+- system.openssh.server.team.members.mvollman