Merge "Add missing default for xtrabackup incr_before_full"
diff --git a/jenkins/client/job/deploy/backupninja_backup.yml b/jenkins/client/job/deploy/backupninja_backup.yml
index 9f61701..147b32b 100644
--- a/jenkins/client/job/deploy/backupninja_backup.yml
+++ b/jenkins/client/job/deploy/backupninja_backup.yml
@@ -26,5 +26,7 @@
ASK_CONFIRMATION:
type: boolean
default: 'true'
- triggers:
- - timed: "${_param:backup_min} ${_param:backup_hour} ${_param:backup_day_of_month} ${_param:backup_month} ${_param:backup_day_of_week}"
+ trigger:
+ timer:
+ enabled: true
+ spec: "${_param:backup_min} ${_param:backup_hour} ${_param:backup_day_of_month} ${_param:backup_month} ${_param:backup_day_of_week}"
diff --git a/jenkins/client/job/deploy/galera_database_backup.yml b/jenkins/client/job/deploy/galera_database_backup.yml
index 9638ee0..8506316 100644
--- a/jenkins/client/job/deploy/galera_database_backup.yml
+++ b/jenkins/client/job/deploy/galera_database_backup.yml
@@ -26,5 +26,7 @@
SALT_MASTER_URL:
type: string
default: "${_param:jenkins_salt_api_url}"
- triggers:
- - timed: "${_param:backup_min} ${_param:backup_hour} ${_param:backup_day_of_month} ${_param:backup_month} ${_param:backup_day_of_week}"
+ trigger:
+ timer:
+ enabled: true
+ spec: "${_param:backup_min} ${_param:backup_hour} ${_param:backup_day_of_month} ${_param:backup_month} ${_param:backup_day_of_week}"
diff --git a/openssh/server/team/members/aabashkin.yml b/openssh/server/team/members/aabashkin.yml
new file mode 100644
index 0000000..4c98c79
--- /dev/null
+++ b/openssh/server/team/members/aabashkin.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ aabashkin:
+ enabled: true
+ name: aabashkin
+ full_name: Alexey V. Abashkin
+ home: /home/aabashkin
+ email: aabashkin@mirantis.com
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ enabled: true
+ user:
+ aabashkin:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcr93dwQyDMXD0KvqzfejZnaGPKJjtN90sM3EpvDizJxGX1LrrjOcv9Z99epMlt5sFR3qkN04RKA8GHAf3yEdTAn6eFA+xQTWBPerLMTk39u3QBHYuguKDBjzQbW4kr2FqCXtBK5gvEUiGq1DghIH2Sz8XdOUt5N9U7VMpa1ywQHwTyramdECXCBtUgakc7NPNP5gChF+JekKkV33xnajH+lWo/WxUsFnWpZFO6Hh0Sca8qcsoOxJz22D7Als6cDAkp6tPXB2kFgp/f95FkmF/45YaTO6UTJtKgb9q9+OdXKDh0wUuQ8dTcYEUOvTY6UzxrBaIPPjtS+p7WM48dYLt
+ user: ${linux:system:user:aabashkin}
diff --git a/openssh/server/team/members/achuprin.yml b/openssh/server/team/members/achuprin.yml
index 62a3984..1fb3b4b 100644
--- a/openssh/server/team/members/achuprin.yml
+++ b/openssh/server/team/members/achuprin.yml
@@ -4,7 +4,7 @@
user:
achuprin:
email: achuprin@mirantis.com
- enabled: true
+ enabled: false
full_name: Alexey Chuprin
home: /home/achuprin
name: achuprin
@@ -13,7 +13,7 @@
server:
user:
achuprin:
- enabled: true
+ enabled: false
public_keys:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDho9gTE/kal/lx/edEa073OgsS5Fa+G3ffGUuhPKpqdXp3TfCKchAK1J13TsqW9lLpPLtnDo2OhgJSUwdr0pfNwVEBPldw0KblW/JQIImR/9nojU+IvribDdusRTOJh6i9hSzcLLFtrF8pkZ7S7oyGsOpD7pHoy+qNiDBO1eJ1fkOxkxztpqSjFFg6BaFtA40zLULsqgKIM0EsSgn3vFAQ2zsDWaGynnm/+tQvBj3ogrxblo94uZ+uUK6Z6v+jkZJKA5Nz+w76HAd51A646X3gF05i2LdyPpkWBp0Oqr5PVW66IGfyc+sY0ID35k+wT9tzv/aW4KOFtig5zf/Xv3nDbX0SlIrV5AMzk3pql2aCSE03JSkHb/Gujf1gqQ6ZqqbVFl7CSj2nIZ1DpWhGqw1lF6YH1pf/xbmg7qRAmDCelf/gCZaj9Pe6nA1a6CP5NJt5l3W20blaT5hYxHDqiBPOfTh8YGI16P1p7pV6VfBiQYZk5KGmOqVjIUfQH9axZcOgZjVmrFW8zZCg1VIA4qhYvVfFokL12ty3AiYkdIcDek3GH83LnLrkTX4D6PPzl6lF5f8bAiUfSjH5Yr2EmRxFWizi3LGiNe7QIxVQgB+B71luHG0ymy1Z080XJqZKMs/wosGxOJUiEvjd1i/jkImCNqlta3sBxnjJQRuzX3mUiQ== achuprin@mirantis.com
user: ${linux:system:user:achuprin}