Merge "Drop parameters:openssh:enabled key from all users"
diff --git a/debmirror/mirror_mirantis_com/cassandra/xenial.yml b/debmirror/mirror_mirantis_com/cassandra/xenial.yml
index e9a80de..807efd1 100644
--- a/debmirror/mirror_mirantis_com/cassandra/xenial.yml
+++ b/debmirror/mirror_mirantis_com/cassandra/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_cassandra_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
diff --git a/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
index bf5b5b9..fb8facc 100644
--- a/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_ceph_luminous_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
@@ -19,4 +16,4 @@
dist: [ xenial ]
section: [ main ]
filter:
- 001: "--exclude='(-dbg_|-dbg-)'"
\ No newline at end of file
+ 001: "--exclude='(-dbg_|-dbg-)'"
diff --git a/debmirror/mirror_mirantis_com/docker/xenial.yml b/debmirror/mirror_mirantis_com/docker/xenial.yml
index 1ed38a9..04d31b3 100644
--- a/debmirror/mirror_mirantis_com/docker/xenial.yml
+++ b/debmirror/mirror_mirantis_com/docker/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_docker_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
@@ -23,4 +20,4 @@
001: "--exclude='docker-ce'"
002: "--include='docker-ce_18.((0[6-9])|([1-9][0-9]))'"
003: "--include='docker-ce_17.((1[2-9])|([2-9][0-9]))'"
- 003: "--include='docker-ce_((19)|([2-9][0-9]))'"
\ No newline at end of file
+ 003: "--include='docker-ce_((19)|([2-9][0-9]))'"
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
index 9230416..cd8a6e1 100644
--- a/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
+++ b/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_elasticsearch_5_x_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
index fbf1222..dfad4ea 100644
--- a/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
+++ b/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_elasticsearch_curator_5_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
diff --git a/debmirror/mirror_mirantis_com/extra/xenial.yml b/debmirror/mirror_mirantis_com/extra/xenial.yml
index 892abd4..28a4b7a 100644
--- a/debmirror/mirror_mirantis_com/extra/xenial.yml
+++ b/debmirror/mirror_mirantis_com/extra/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_extra_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
@@ -17,4 +14,4 @@
target_dir: "${_param:debmirror_mirrors_base_target_dir}/extra/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_extra_xenial.log"
dist: [ xenial ]
- section: [ main ]
\ No newline at end of file
+ section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml b/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
index 7e2b06c..a8a5680 100644
--- a/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
+++ b/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_glusterfs_3_8_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
diff --git a/debmirror/mirror_mirantis_com/maas/xenial.yml b/debmirror/mirror_mirantis_com/maas/xenial.yml
index 77267cc..f90589b 100644
--- a/debmirror/mirror_mirantis_com/maas/xenial.yml
+++ b/debmirror/mirror_mirantis_com/maas/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_maas_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
diff --git a/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
index 3e6dca0..d85f091 100644
--- a/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
+++ b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_openstack_pike_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
@@ -17,4 +14,4 @@
target_dir: "${_param:debmirror_mirrors_base_target_dir}/openstack-pike/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_openstack_pike_xenial.log"
dist: [ xenial ]
- section: [ main ]
\ No newline at end of file
+ section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
index 99dec3b..3c98d29 100644
--- a/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
+++ b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_openstack_queens_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
@@ -17,4 +14,4 @@
target_dir: "${_param:debmirror_mirrors_base_target_dir}/openstack-queens/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_openstack_queens_xenial.log"
dist: [ xenial ]
- section: [ main ]
\ No newline at end of file
+ section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/percona/xenial.yml b/debmirror/mirror_mirantis_com/percona/xenial.yml
index 95e8a32..42f5ade 100644
--- a/debmirror/mirror_mirantis_com/percona/xenial.yml
+++ b/debmirror/mirror_mirantis_com/percona/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_percona_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
diff --git a/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml b/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
index cfd3bfd..9945483 100644
--- a/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
+++ b/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_saltstack_2016_3_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
diff --git a/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml b/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
index a5c6097..13d13c2 100644
--- a/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
+++ b/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_saltstack_2017_7_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
diff --git a/debmirror/mirror_mirantis_com/td-agent/xenial.yml b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
index d141967..8aa8311 100644
--- a/debmirror/mirror_mirantis_com/td-agent/xenial.yml
+++ b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_td_agent_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
@@ -17,4 +14,4 @@
target_dir: "${_param:debmirror_mirrors_base_target_dir}/td-agent/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_td_agent_xenial.log"
dist: [ xenial ]
- section: [ contrib ]
\ No newline at end of file
+ section: [ contrib ]
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index 6bc9d79..e66d46e 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -1,7 +1,4 @@
parameters:
- _param:
- mirror_mirantis_com_ubuntu_xenial_force: False
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
debmirror:
client:
enabled: true
diff --git a/defaults/debmirror.yml b/defaults/debmirror.yml
new file mode 100644
index 0000000..4376529
--- /dev/null
+++ b/defaults/debmirror.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ # Global
+ debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+ # Per repo modificators
+ mirror_mirantis_com_cassandra_xenial_force: False
+ mirror_mirantis_com_ceph_luminous_xenial_force: False
+ mirror_mirantis_com_docker_xenial_force: False
+ mirror_mirantis_com_elasticsearch_5_x_xenial_force: False
+ mirror_mirantis_com_elasticsearch_curator_5_xenial_force: False
+ mirror_mirantis_com_extra_xenial_force: False
+ mirror_mirantis_com_glusterfs_3_8_xenial_force: False
+ mirror_mirantis_com_maas_xenial_force: False
+ mirror_mirantis_com_openstack_pike_xenial_force: False
+ mirror_mirantis_com_openstack_queens_xenial_force: False
+ mirror_mirantis_com_percona_xenial_force: False
+ mirror_mirantis_com_saltstack_2016_3_xenial_force: False
+ mirror_mirantis_com_saltstack_2017_7_xenial_force: False
+ mirror_mirantis_com_td_agent_xenial_force: False
+ mirror_mirantis_com_ubuntu_xenial_force: False
diff --git a/defaults/init.yml b/defaults/init.yml
index f17e399..022f44c 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -1,5 +1,6 @@
classes:
- system.defaults.linux_system_repo
+- system.defaults.debmirror
parameters:
# Transition in progress.
# Please ignore 'G' transition marker - it uses only for internal purposes
diff --git a/openssh/server/team/members/osavatieiev.yml b/openssh/server/team/members/osavatieiev.yml
new file mode 100644
index 0000000..54411f3
--- /dev/null
+++ b/openssh/server/team/members/osavatieiev.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ osavatieiev:
+ enabled: true
+ name: osavatieiev
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Alex Savatieiev
+ home: /home/osavatieiev
+ email: osavatieiev@mirantis.com
+ openssh:
+ server:
+ user:
+ osavatieiev:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1LOY6PdhYlueDeIx2ASl+56z+eUGqYXA2Aqep5W5j68W7ZRB0lmuam2Bqh5WVRP14l2pTQrV9CsCd8G1Y4nQamAwIb86ipf+8KKEawVaeWjihcUQf5VVwKIZEeZEwdHJFk5wK9YfmICn2x6rhKlQJ5ibcHpHlhdOgoscxvHMixzVxLGeRVyGn3OOeiGCEF+Ltt/ug1vj8A/9ytOCL0OMJJ9Oj8bCxrp9VQlVMAJt6Jp7iL6K8Q0J97/MZ1MehVr5RrpVf2wKNKrydfSwdqw+ZgIiQWRVl6yzv4S8AWCVhyFRMe7b1hMRpSQOqsW3oKgDyxfhc34/FFBNLOdAsQCSf osavatieiev@mirantis.com
+ user: ${linux:system:user:osavatieiev}
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 21ccba7..126a43b 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -17,6 +17,7 @@
- system.openssh.server.team.members.yisakov
- system.openssh.server.team.members.vblokhin
- system.openssh.server.team.members.dstremkouski
+- system.openssh.server.team.members.osavatieiev
- system.openssh.server.team.members.mchernik
- system.openssh.server.team.members.hkraemer
- system.openssh.server.team.members.pbasov