Merge changes from topic 'octavia_net'
* changes:
Add mine functions to get Octavia network, port and secgroup info
Add Neutron client metadata to create Octavia port
diff --git a/devops_portal/service/janitor_monkey.yml b/devops_portal/service/janitor_monkey.yml
new file mode 100644
index 0000000..73f2e7c
--- /dev/null
+++ b/devops_portal/service/janitor_monkey.yml
@@ -0,0 +1,10 @@
+parameters:
+ devops_portal:
+ config:
+ service:
+ janitormonkey:
+ configure_proxy: true
+ endpoint:
+ address: ${_param:haproxy_janitor_monkey_bind_host}
+ port: ${_param:haproxy_janitor_monkey_bind_port}
+ https: ${_param:haproxy_janitor_monkey_ssl:enabled}
diff --git a/docker/swarm/stack/janitor_monkey.yml b/docker/swarm/stack/janitor_monkey.yml
index 2d5f4a7..426a75c 100644
--- a/docker/swarm/stack/janitor_monkey.yml
+++ b/docker/swarm/stack/janitor_monkey.yml
@@ -4,6 +4,21 @@
docker_image_mongodb: library/mongo:3.4
docker_mongodb_admin_username: admin
docker_mongodb_admin_password: password
+ docker_image_janitor_monkey: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/janitor_monkey:6040
+ janitor_monkey_enabled: true
+ janitor_monkey_dryrun_mode: false
+ janitor_monkey_base_url: http://${_param:haproxy_janitor_monkey_bind_host}:${_param:haproxy_janitor_monkey_bind_port}
+ janitor_monkey_mongodb_host: ${_param:haproxy_mongodb_bind_host}
+ janitor_monkey_mongodb_port: ${_param:haproxy_mongodb_bind_port}
+ janitor_monkey_mongodb_db: mcp_cloud
+ janitor_monkey_mongodb_username: janitor
+ janitor_monkey_mongodb_password: password
+ janitor_monkey_elasticsearch: ${_param:haproxy_elasticsearch_bind_host}:${_param:haproxy_elasticsearch_binary_bind_port}
+ janitor_monkey_cloudfire_region: RegionOne
+ janitor_monkey_cis_clustername: ${_param:elasticsearch_cluster_name}
+ janitor_monkey_openstack:
+ project_domain_name: default
+ project_name: admin
docker:
client:
stack:
@@ -11,6 +26,24 @@
environment:
MONGO_INITDB_ROOT_USERNAME: ${_param:docker_mongodb_admin_username}
MONGO_INITDB_ROOT_PASSWORD: ${_param:docker_mongodb_admin_password}
+ simianarmy.recorder.mongodb.host: ${_param:janitor_monkey_mongodb_host}
+ simianarmy.recorder.mongodb.port: ${_param:janitor_monkey_mongodb_port}
+ simianarmy.recorder.mongodb.database: ${_param:janitor_monkey_mongodb_db}
+ simianarmy.recorder.mongodb.user: ${_param:janitor_monkey_mongodb_username}
+ simianarmy.recorder.mongodb.password: ${_param:janitor_monkey_mongodb_password}
+ simianarmy.base.url: ${_param:janitor_monkey_base_url}
+ simianarmy.janitor.enabled: ${_param:janitor_monkey_enabled}
+ simianarmy.janitor.leashed: ${_param:janitor_monkey_dryrun_mode}
+ simianarmy.calendar.isMonkeyTime: true
+ simianarmy.janitor.resources.sdb.domain: ${_param:janitor_monkey_mongodb_db}
+ simianarmy.client.cloudfire.cis.hosts: ${_param:janitor_monkey_elasticsearch}
+ simianarmy.client.cloudfire.region: ${_param:janitor_monkey_cloudfire_region}
+ simianarmy.client.cloudfire.cis.clustername: ${_param:janitor_monkey_cis_clustername}
+ simianarmy.client.cloudfire.identityEndpoint: ${_param:janitor_monkey_openstack:auth_url}
+ simianarmy.client.cloudfire.accountKey: ${_param:janitor_monkey_openstack:username}
+ simianarmy.client.cloudfire.secretKey: ${_param:janitor_monkey_openstack:password}
+ simianarmy.client.cloudfire.domain: ${_param:janitor_monkey_openstack:project_domain_name}
+ simianarmy.client.cloudfire.project: ${_param:janitor_monkey_openstack:project_name}
service:
mongodb:
image: ${_param:docker_image_mongodb}
@@ -21,4 +54,12 @@
ports:
- ${_param:haproxy_mongodb_exposed_port}:${_param:haproxy_mongodb_bind_port}
volumes:
- - /srv/volumes/mongodb:/data
+ - /srv/volumes/mongodb:/data/db
+ api:
+ image: ${_param:docker_image_janitor_monkey}
+ deploy:
+ replicas: ${_param:docker_janitor_monkey_replicas}
+ restart_policy:
+ condition: any
+ ports:
+ - ${_param:haproxy_janitor_monkey_exposed_port}:8080
diff --git a/docker/swarm/stack/postgresql.yml b/docker/swarm/stack/postgresql.yml
index 73435fb..7ae4052 100644
--- a/docker/swarm/stack/postgresql.yml
+++ b/docker/swarm/stack/postgresql.yml
@@ -11,7 +11,6 @@
environment:
POSTGRES_USER: ${_param:postgresql_admin_user}
POSTGRES_PASSWORD: ${_param:postgresql_admin_user_password}
- SQLALCHEMY_POOL_RECYCLE: 14400
service:
db:
image: ${_param:docker_image_postgresql}
diff --git a/docker/swarm/stack/security_monkey.yml b/docker/swarm/stack/security_monkey.yml
index a83f2a0..2d06a42 100644
--- a/docker/swarm/stack/security_monkey.yml
+++ b/docker/swarm/stack/security_monkey.yml
@@ -14,7 +14,6 @@
security_monkey_api_port: ${_param:haproxy_security_monkey_bind_port}
security_monkey_nginx_port: ${_param:haproxy_security_monkey_bind_port}
devops_portal_sm_wtf_csrf_enabled: False
- security_monkey_sync_interval: 15
security_monkey_openstack:
os_account_id: mcp_cloud
os_account_name: mcp_cloud
@@ -50,7 +49,8 @@
OS_PROJECT_NAME: ${_param:security_monkey_openstack:project_name}
USER_DOMAIN_NAME: ${_param:security_monkey_openstack:user_domain_name}
SM_WTF_CSRF_ENABLED: ${_param:devops_portal_sm_wtf_csrf_enabled}
- SECURITY_MONKEY_SYNC_INTERVAL: ${_param:security_monkey_sync_interval}
+ SQLALCHEMY_DATABASE_URI: postgresql://${_param:secmonkey_db_user}:${_param:secmonkey_db_user_password}@${_param:secmonkey_db_host}:${_param:haproxy_postgresql_bind_port}/${_param:security_monkey_db}
+ SQLALCHEMY_POOL_RECYCLE: 14400
service:
api:
image: ${_param:docker_image_security_monkey_api}
diff --git a/elasticsearch/client/index/janitor_monkey.yml b/elasticsearch/client/index/janitor_monkey.yml
new file mode 100644
index 0000000..bef92ae
--- /dev/null
+++ b/elasticsearch/client/index/janitor_monkey.yml
@@ -0,0 +1,15 @@
+parameters:
+ _param:
+ janitor_monkey_cis_openstack_shards: 5
+ janitor_monkey_cis_openstack_replicas: 1
+ elasticsearch:
+ client:
+ index:
+ cis-openstack:
+ enabled: true
+ force_operation: true
+ definition:
+ template: cis-openstack
+ settings:
+ number_of_shards: ${_param:janitor_monkey_cis_openstack_shards}
+ number_of_replicas: ${_param:janitor_monkey_cis_openstack_replicas}
\ No newline at end of file
diff --git a/elasticsearch/client/pushkin/notifications.yml b/elasticsearch/client/index/pushkin.yml
similarity index 100%
rename from elasticsearch/client/pushkin/notifications.yml
rename to elasticsearch/client/index/pushkin.yml
diff --git a/elasticsearch/client/init.yml b/elasticsearch/client/init.yml
new file mode 100644
index 0000000..d0710ca
--- /dev/null
+++ b/elasticsearch/client/init.yml
@@ -0,0 +1,10 @@
+parameters:
+ _param:
+ elasticsearch_client_host: ${_param:haproxy_elasticsearch_bind_host}
+ elasticsearch_client_port: ${_param:haproxy_elasticsearch_http_bind_port}
+ elasticsearch:
+ client:
+ enabled: true
+ server:
+ host: ${_param:elasticsearch_client_host}
+ port: ${_param:elasticsearch_client_port}
\ No newline at end of file
diff --git a/elasticsearch/client/pushkin/init.yml b/elasticsearch/client/pushkin/init.yml
deleted file mode 100644
index 9f37847..0000000
--- a/elasticsearch/client/pushkin/init.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- _param:
- pushkin_elasticsearch_host: ${_param:haproxy_elasticsearch_bind_host}
- pushkin_elasticsearch_port: ${_param:haproxy_elasticsearch_http_bind_port}
- elasticsearch:
- client:
- enabled: true
- server:
- host: ${_param:pushkin_elasticsearch_host}
- port: ${_param:pushkin_elasticsearch_port}
\ No newline at end of file
diff --git a/freeipa/client/dns.yml b/freeipa/client/dns.yml
new file mode 100644
index 0000000..b88174e
--- /dev/null
+++ b/freeipa/client/dns.yml
@@ -0,0 +1,8 @@
+parameters:
+ linux:
+ network:
+ resolv:
+ dns:
+ - ${_param:freeipa_node01_hostname}
+ - ${_param:freeipa_node02_hostname}
+ - ${_param:freeipa_node03_hostname}
diff --git a/freeipa/client/keytab/apache2.yml b/freeipa/client/keytab/apache2.yml
new file mode 100644
index 0000000..3b18150
--- /dev/null
+++ b/freeipa/client/keytab/apache2.yml
@@ -0,0 +1,11 @@
+parameters:
+ freeipa:
+ client:
+ keytab:
+ /etc/apache2/ipa.keytab:
+ user: root
+ group: www-data
+ mode: 640
+ identities:
+ - service: HTTP
+ host: ${linux:network:hostname}
diff --git a/freeipa/client/keytab/krb5.yml b/freeipa/client/keytab/krb5.yml
new file mode 100644
index 0000000..4555927
--- /dev/null
+++ b/freeipa/client/keytab/krb5.yml
@@ -0,0 +1,8 @@
+parameters:
+ freeipa:
+ client:
+ keytab:
+ /etc/krb5.keytab:
+ identities:
+ - service: host
+ host: ${linux:network:hostname}.${_param:cluster_domain}
diff --git a/freeipa/client/nsupdate.yml b/freeipa/client/nsupdate.yml
new file mode 100644
index 0000000..837b9c7
--- /dev/null
+++ b/freeipa/client/nsupdate.yml
@@ -0,0 +1,10 @@
+parameters:
+ _param:
+ freeipa_client_nsupdate_01_address: 172.16.10.240
+ freeipa:
+ client:
+ nsupdate:
+ - name: ${linux:network:hostname}.${_param:cluster_domain}
+ ipv4:
+ - ${_param:freeipa_client_nsupdate_01_address}
+ server: idm.${_param:cluster_domain}
diff --git a/haproxy/proxy/listen/oss/janitor_monkey.yml b/haproxy/proxy/listen/oss/janitor_monkey.yml
new file mode 100644
index 0000000..c2ff760
--- /dev/null
+++ b/haproxy/proxy/listen/oss/janitor_monkey.yml
@@ -0,0 +1,40 @@
+parameters:
+ _param:
+ haproxy_janitor_monkey_bind_host: ${_param:haproxy_bind_address}
+ haproxy_janitor_monkey_bind_port: 8088
+ haproxy_janitor_monkey_exposed_port: 18088
+ haproxy_janitor_monkey_ssl:
+ enabled: false
+ haproxy:
+ proxy:
+ listen:
+ janitor_monkey:
+ mode: http
+ options:
+ - httpchk get /simianarmy/api/v1/janitor
+ balance: source
+ http_request:
+ - action: "add-header X-Forwarded-Proto https"
+ condition: "if { ssl_fc }"
+ health-check:
+ http:
+ enabled: true
+ options:
+ - expect status 200
+ binds:
+ - address: ${_param:haproxy_janitor_monkey_bind_host}
+ port: ${_param:haproxy_janitor_monkey_bind_port}
+ ssl: ${_param:haproxy_janitor_monkey_ssl}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: ${_param:haproxy_janitor_monkey_exposed_port}
+ params: check
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: ${_param:haproxy_janitor_monkey_exposed_port}
+ params: backup check
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: ${_param:haproxy_janitor_monkey_exposed_port}
+ params: backup check
diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index 797f378..4e4080b 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -2,10 +2,6 @@
_param:
jenkins_cloud_deploy_pipelines:
- stack_name: k8s_calico
- stack_type: heat
- stack_install: core,k8s,calico
- job_timer: ""
- - stack_name: k8s_calico
stack_type: aws
stack_install: core,k8s,calico
job_timer: "H H * * *"
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index 4e1fd97..243fbf0 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -80,6 +80,12 @@
test: openstack
timer: ""
extra_formulas: ""
+ - lab: virtual_mcp11_ironic_small
+ install: core,openstack
+ stack_type: heat
+ test: openstack
+ timer: ""
+ extra_formulas: ""
- lab: virtual_mcp11_k8s_calico
install: core,k8s,calico
stack_type: heat
@@ -104,3 +110,10 @@
test: openstack
timer: "H H(0-6) * * *"
extra_formulas: ""
+ # Identity AAA
+ - lab: virtual_aaa_freeipa
+ install: core,aaa
+ stack_type: heat
+ test: ""
+ timer: ""
+ extra_formulas: ""
diff --git a/jenkins/client/job/docker/cis-collectors.yml b/jenkins/client/job/docker/oss/cis-collectors.yml
similarity index 100%
rename from jenkins/client/job/docker/cis-collectors.yml
rename to jenkins/client/job/docker/oss/cis-collectors.yml
diff --git a/jenkins/client/job/docker/devops-portal.yml b/jenkins/client/job/docker/oss/devops-portal.yml
similarity index 100%
rename from jenkins/client/job/docker/devops-portal.yml
rename to jenkins/client/job/docker/oss/devops-portal.yml
diff --git a/jenkins/client/job/docker/oss/init.yml b/jenkins/client/job/docker/oss/init.yml
new file mode 100644
index 0000000..9e36046
--- /dev/null
+++ b/jenkins/client/job/docker/oss/init.yml
@@ -0,0 +1,4 @@
+parameters:
+ - system.jenkins.client.job.docker.oss.cis-collectors
+ - system.jenkins.client.job.docker.oss.devops-portal
+ - system.jenkins.client.job.docker.oss.rundeck
diff --git a/jenkins/client/job/docker/rundeck.yml b/jenkins/client/job/docker/oss/rundeck.yml
similarity index 100%
rename from jenkins/client/job/docker/rundeck.yml
rename to jenkins/client/job/docker/oss/rundeck.yml
diff --git a/jenkins/client/job/oss/init.yml b/jenkins/client/job/oss/init.yml
new file mode 100644
index 0000000..0e23f01
--- /dev/null
+++ b/jenkins/client/job/oss/init.yml
@@ -0,0 +1,3 @@
+classes:
+ - system.jenkins.client.job.oss.test_devops_portal
+ - system.jenkins.client.job.oss.test_security_monkey_openstack
diff --git a/jenkins/client/job/test_devops_portal.yml b/jenkins/client/job/oss/test_devops_portal.yml
similarity index 100%
rename from jenkins/client/job/test_devops_portal.yml
rename to jenkins/client/job/oss/test_devops_portal.yml
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index e59ae6a..7c2b369 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -68,16 +68,6 @@
credentials: "gerrit"
script: test-system-reclass-pipeline.groovy
concurrent: true
- trigger:
- gerrit:
- project:
- salt-models/{{name}}:
- branches:
- - master
- event:
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
param:
TEST_MODELS:
type: string
@@ -102,8 +92,6 @@
credentials: "jenkins-mk"
script: test-cookiecutter-reclass.groovy
trigger:
- pollscm:
- spec: ${_param:jenkins_pollscm_spec}
gerrit:
project:
mk/{{cookiecutter_template}}:
diff --git a/keystone/client/service/ironic.yml b/keystone/client/service/ironic.yml
index beb99a1..1ab9872 100644
--- a/keystone/client/service/ironic.yml
+++ b/keystone/client/service/ironic.yml
@@ -12,14 +12,6 @@
is_admin: true
password: ${_param:keystone_ironic_password}
email: ${_param:admin_email}
- admin_identity:
- admin:
- user: admin
- password: ${_param:keystone_admin_password}
- project: admin
- host: ${_param:keystone_service_host}
- port: 5000
- region_name: ${_param:openstack_region}
service:
ironic:
type: baremetal
@@ -36,3 +28,11 @@
admin_address: ${_param:ironic_service_host}
admin_port: 6385
admin_path: ''
+ admin_identity:
+ admin:
+ user: admin
+ password: ${_param:keystone_admin_password}
+ project: admin
+ host: ${_param:keystone_service_host}
+ port: 5000
+ region_name: ${_param:openstack_region}
diff --git a/linux/system/repo/mcp/salt.yml b/linux/system/repo/mcp/salt/init.yml
similarity index 100%
rename from linux/system/repo/mcp/salt.yml
rename to linux/system/repo/mcp/salt/init.yml
diff --git a/linux/system/repo/mcp/salt/unstable.yml b/linux/system/repo/mcp/salt/unstable.yml
new file mode 100644
index 0000000..b0b992e
--- /dev/null
+++ b/linux/system/repo/mcp/salt/unstable.yml
@@ -0,0 +1,17 @@
+classes:
+- linux.system.repo.mcp.salt
+parameters:
+ _param:
+ linux_system_repo_mcp_salt_unstable_version: testing
+ linux:
+ system:
+ repo:
+ mcp_salt_unstable:
+ source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_salt_unstable_version} salt"
+ architectures: amd64
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_salt_unstable_version}'
+ priority: 90
+ package: '*'
diff --git a/linux/system/repo_local/mcp/salt.yml b/linux/system/repo_local/mcp/salt/init.yml
similarity index 100%
rename from linux/system/repo_local/mcp/salt.yml
rename to linux/system/repo_local/mcp/salt/init.yml
diff --git a/linux/system/repo_local/mcp/salt/unstable.yml b/linux/system/repo_local/mcp/salt/unstable.yml
new file mode 100644
index 0000000..4d2f9a7
--- /dev/null
+++ b/linux/system/repo_local/mcp/salt/unstable.yml
@@ -0,0 +1,17 @@
+classes:
+- linux.system.repo_local.mcp.salt
+parameters:
+ _param:
+ linux_system_repo_mcp_salt_unstable_version: testing
+ linux:
+ system:
+ repo:
+ mcp_salt_unstable:
+ refresh_db: ${_param:linux_repo_refresh_db}
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_salt_unstable_version} salt"
+ architectures: amd64
+ key_url: "http://${_param:local_repo_url}/public.gpg"
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_salt_unstable_version}'
+ priority: 90
+ package: '*'
diff --git a/openssh/server/team/ccp_team.yml b/openssh/server/team/k8s_apps_team.yml
similarity index 66%
rename from openssh/server/team/ccp_team.yml
rename to openssh/server/team/k8s_apps_team.yml
index 3355dc1..e57ed1a 100644
--- a/openssh/server/team/ccp_team.yml
+++ b/openssh/server/team/k8s_apps_team.yml
@@ -2,20 +2,6 @@
linux:
system:
user:
- kproskurin:
- enabled: true
- name: kproskurin
- sudo: true
- full_name: Kirill Proskurin
- home: /home/kproskurin
- email: kproskurin@mirantis.com
- sreshetnyak:
- enabled: true
- name: sreshetnyak
- sudo: true
- full_name: Sergey Reshetnyak
- home: /home/sreshetnyak
- email: sreshetnyak@mirantis.com
apavlov:
enabled: true
name: apavlov
@@ -23,13 +9,20 @@
full_name: Andrey Pavlov
home: /home/apavlov
email: apavlov@mirantis.com
- sryabin:
+ mzhnichkov:
enabled: true
- name: sryabin
+ name: mzhnichkov
sudo: true
- full_name: Sergey Ryabin
- home: /home/sryabin
- email: sryabin@mirantis.com
+ full_name: Michail Zhnichkov
+ home: /home/mzhnichkov
+ email: mzhnichkov@mirantis.com
+ prazumovsky:
+ enabled: true
+ name: prazumovsky
+ sudo: true
+ full_name: Peter Razumovsky
+ home: /home/prazumovsky
+ email: prazumovsky@mirantis.com
slukjanov:
enabled: true
name: slukjanov
@@ -37,6 +30,13 @@
full_name: Sergey Lukjanov
home: /home/slukjanov
email: slukjanov@mirantis.com
+ sreshetnyak:
+ enabled: true
+ name: sreshetnyak
+ sudo: true
+ full_name: Sergey Reshetnyak
+ home: /home/sreshetnyak
+ email: sreshetnyak@mirantis.com
ytaraday:
enabled: true
name: ytaraday
@@ -48,46 +48,46 @@
server:
enabled: true
user:
- kproskurin:
- enabled: true
- public_keys:
- - ${public_keys:kproskurin}
- user: ${linux:system:user:kproskurin}
- sreshetnyak:
- enabled: true
- public_keys:
- - ${public_keys:sreshetnyak}
- user: ${linux:system:user:sreshetnyak}
apavlov:
enabled: true
public_keys:
- ${public_keys:apavlov}
user: ${linux:system:user:apavlov}
- sryabin:
+ mzhnichkov:
enabled: true
public_keys:
- - ${public_keys:sryabin}
- user: ${linux:system:user:sryabin}
+ - ${public_keys:mzhnichkov}
+ user: ${linux:system:user:mzhnichkov}
+ prazumovsky:
+ enabled: true
+ public_keys:
+ - ${public_keys:prazumovsky}
+ user: ${linux:system:user:prazumovsky}
slukjanov:
enabled: true
public_keys:
- ${public_keys:slukjanov}
user: ${linux:system:user:slukjanov}
+ sreshetnyak:
+ enabled: true
+ public_keys:
+ - ${public_keys:sreshetnyak}
+ user: ${linux:system:user:sreshetnyak}
ytaraday:
enabled: true
public_keys:
- ${public_keys:ytaraday}
user: ${linux:system:user:ytaraday}
public_keys:
- kproskurin:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBvuPnwVjS5AuxOp4Bd3zRFhE1IB7g5R8LMwfCpqokolV0pHw1QGbCFprBcahvR0daGla/lB0buUu1sCLmFm0QH/m3VD9PkY8VE/4XW58yCtA5/ANYqLchWaNxaaaQG8Sg3gxtcMwLUQ92HFejZT9c0jgQDRc8pTHHuPj/HuV1I2Cw2a/DHZtrMbMT27aAglrPFiMty+P1Gd5mdHAXK8sfK+LSZ9/PZ2IbW0fCGL3tE8rTwL7FG5rN7eeaX56lWwO3oQMu184Wi1vL/ukIt2sdRi6qvKAYfeELPzffo8GOhesQAq+BXzjpIo2HUT2gSkZid0YzX7lRLPWhAi1sdq3V oloremo@iHAL9000-2.local
- sreshetnyak:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbc8cUMy2Stjq4qS8TaVGvTIUGetpgTcLCiW3NnG5Yqe+s+nlQnIL3ezvgSKHin4/PYHl8vV9FnmLdPLk+4eefoek1px8soW/B+Ri0KN6aQUy1ztcecMxcxRH9g4VLZWTbazqGsADwRCQVPXmyIQVQN5wMKd0IzXUp5c03dWv/I1PE7QPdKySrdhjjyo+1Npx/tQjtJaSnGCaUJrXfHXBxiiENzmHuY+se14nWV9RyYN3zRWsa8Yt1n2hWNNiKNfT89h6yFwZAxdsS+jGhzbGTLcWyAqq3sfvvgm0yeL5FEm0AKaOMv7AuM5LqjPkQE4zzCGA0j19EQlAjsVcvKHGH sreshetniak@workstation
apavlov:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC13FvtJl6OdwdiaLFYfJO5WaA7YUMi2/DJJECWtrjJPObGPeAQ1Z8zxQWanwZVhDO7E5oR7n/LmuKHaJkRIFyQEZY3mHS3k4yybg0Vqu2FcGWQO4P3R16v6qDLvuvu9S4sUkYF3k8oYDzwN/Vc+o7a4AkL5U5rjB3vbLWVdGg8G61jFjdekXbJdFCb0liPpcQrUe1yZmjE2E4ERPOZLCVADPiVzXJhtbKigbn/nwdk4D0g+eq3NW0AwJfkyCu6mt1xXfk6gmhUrBPh1ostWv6mSpD9bXvxIKv/QnIM4SUJ/RhJH0uhWtpH4GeXvnPXHs0bxfyq1GtQt5bD3gqCHruz apavlov@Andreys-MacBook-Pro.local
- sryabin:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5KZguajyeerULef0PxEZGOvY2yzaFd+Ob9sdM1v57RZBOyu8EdfNwso1OuLRwrZP6o6V8OBJ95O1AKE0ay5PQzu3VlbZgQfVTazc7ngKOqvIZP7JYlxM58cHcU+Hu1fvtdDYbc0cOzIP1Cu+AA4ZRiqa9YxMbI8i8bKR+MdgX+yKErXiEeM6wMmg8MEyGFFLxNmeOY78pS4xxlFsyd78JkS+TCAStULIahffPDcJI02Kt1Af9lGRyM3fKoFlNx0/lsPncvTGz/trgjAae1Q6f1CrH2saXNtFSwi58Qs6sP4A9lxMTtkGhbUMhkInYg5w+9QnZcGYfBNqXvhA6qbrH
+ prazumovsky:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMGi+I02wfKwHqKoTahRJg3TWX9SaYjKBRKndmVfz4J9kptuQEsVbJGiBIxOKV4unFvBSgVDVgZ4rUwwkL2nMrdATAWiBeVcgaNTt4kVBxD21wAeFWi0kTgrJ403jqOqH/WIKA6lnGUCmdRxp3phcjHRlgw/ZOnFu6AuZqtO1Luxg/9PawOFcoCjWWDolp/ICSHBhGZuDWThvTSgVQTd10oMP55LMjuxSOdvM1ZjWczyxegKD7lt7j+FjQXHzGUyqcCH/NlXl4VHdjaNG2muP0lY+QRiRMye3qftu15qgRxqQtL1QksBspDP2TvVVTwE7c0m7VtKaQtnmlsJGUx/7H prazumovsky@shprotby-box
+ mzhnichkov:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDW54LczyIFu1cKKDiKTcc3CQpY1sosDez7nLlOCdhyn096rl5q4GbjcX5WtMvlArKKjw5cRoBGMlLdJuQ+5PGfxnlK0GOaa924AyQSNINUyvEshV4D1OvEScN/lM0TNQZ3tkIw4YbST1g5JoSkq0MRv/qlzdv8Jg0sV4phZcx410uVQ0oVhfQgrGuq6pjf1fQpvo00cfGUyZRzF9JsxVGHdkXPgYB+W479Smha9GE2wkpiQscnnFyAcs50auLEt9E6/Tw+4fSK1dTgbD0MCSopI+E9WgVaCAxcTaEKaIB32gbgG3jRziC711GDdF4567hM1xDspPc3LeGSsTa4eAYN
slukjanov:
key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOV5dNsXJ6aJMml7JSd4cJ54qYhOya18QNEdb7NJ88yo
+ sreshetnyak:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbc8cUMy2Stjq4qS8TaVGvTIUGetpgTcLCiW3NnG5Yqe+s+nlQnIL3ezvgSKHin4/PYHl8vV9FnmLdPLk+4eefoek1px8soW/B+Ri0KN6aQUy1ztcecMxcxRH9g4VLZWTbazqGsADwRCQVPXmyIQVQN5wMKd0IzXUp5c03dWv/I1PE7QPdKySrdhjjyo+1Npx/tQjtJaSnGCaUJrXfHXBxiiENzmHuY+se14nWV9RyYN3zRWsa8Yt1n2hWNNiKNfT89h6yFwZAxdsS+jGhzbGTLcWyAqq3sfvvgm0yeL5FEm0AKaOMv7AuM5LqjPkQE4zzCGA0j19EQlAjsVcvKHGH sreshetniak@workstation
ytaraday:
key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtcRlAQg3baU14eBh8THRv+1T5sHCGAIeFaReEB/KRT