Merge "Fix default variables for virtual_mcp11_aio"
diff --git a/ceph/mon/cluster.yml b/ceph/mon/cluster.yml
new file mode 100644
index 0000000..35d5596
--- /dev/null
+++ b/ceph/mon/cluster.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceph.mon.cluster
diff --git a/ceph/osd/cluster.yml b/ceph/osd/cluster.yml
new file mode 100644
index 0000000..9e98f91
--- /dev/null
+++ b/ceph/osd/cluster.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ceph.osd.cluster
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 9be62af..ebacf60 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -12,6 +12,8 @@
- method groovy.json.JsonSlurperClassic parseText java.lang.String
- method groovy.lang.GString getBytes
- method groovy.lang.GroovyObject getProperty java.lang.String
+ - method groovy.util.Node attributes
+ - method groovy.util.XmlParser parse java.io.File
- method hudson.PluginManager getPlugins
- method hudson.PluginWrapper getShortName
- method hudson.model.Item getName
@@ -68,6 +70,7 @@
- new groovy.json.JsonBuilder
- new groovy.json.JsonBuilder java.lang.Object
- new groovy.json.JsonSlurperClassic
+ - new groovy.util.XmlParser
- new java.io.File java.lang.String
- new java.io.IOException java.lang.String
- new java.io.OutputStreamWriter java.io.OutputStream
diff --git a/jenkins/client/job/ceph/init.yml b/jenkins/client/job/ceph/init.yml
new file mode 100644
index 0000000..e4f2ba4
--- /dev/null
+++ b/jenkins/client/job/ceph/init.yml
@@ -0,0 +1,2 @@
+classes:
+- system.jenkins.client.job.ceph.remove-osd
diff --git a/jenkins/client/job/ceph/remove-osd.yml b/jenkins/client/job/ceph/remove-osd.yml
new file mode 100644
index 0000000..10b9028
--- /dev/null
+++ b/jenkins/client/job/ceph/remove-osd.yml
@@ -0,0 +1,42 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ ceph-remove-osd:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Ceph - remove OSD"
+ discard:
+ build:
+ keep_num: 50
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: ceph-remove-osd.groovy
+ param:
+ # general parameters
+ SALT_MASTER_URL:
+ type: string
+ description: URL of Salt master
+ default: "http://${_param:salt_master_host}:6969"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ description: Credentials for login to Salt API
+ default: salt
+ HOST:
+ type: string
+ description: OSDs on this HOST will be removed from cluster
+ OSD:
+ type: all
+ description: These OSDs at HOST will be removed (comma-separated list)
+ ADMIN_HOST:
+ type: string
+ description: Host with admin keyring and access to cluster management
+ CLUSTER_FLAGS:
+ type: string
+ description: Flags to be aplied before pipeline and after pipeline (comma-separated list)
+ WAIT_FOR_HEALTHY:
+ type: boolean
+ default: 'false'
+ description: Wait for healthy during pipeline
diff --git a/jenkins/client/job/deploy/lab/component/ceph.yml b/jenkins/client/job/deploy/lab/component/ceph.yml
index b0b3af1..f8953b6 100644
--- a/jenkins/client/job/deploy/lab/component/ceph.yml
+++ b/jenkins/client/job/deploy/lab/component/ceph.yml
@@ -9,3 +9,9 @@
stack_install: core,ceph
stack_test: "ceph"
job_timer: ""
+ - stack_name: ceph_ha
+ stack_env: devcloud
+ stack_type: aws
+ stack_install: core,ceph
+ stack_test: "ceph"
+ job_timer: ""
diff --git a/jenkins/client/job/docker/cleanup.yml b/jenkins/client/job/docker/cleanup.yml
new file mode 100644
index 0000000..eff5754
--- /dev/null
+++ b/jenkins/client/job/docker/cleanup.yml
@@ -0,0 +1,35 @@
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins_salt_model_name: "salt"
+ jenkins:
+ client:
+ job:
+ docker-cleanup-pipeline:
+ name: docker-cleanup
+ discard:
+ build:
+ keep_num: 3
+ artifact:
+ keep_num: 3
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: docker-cleanup-pipeline.groovy
+ trigger:
+ timer:
+ spec: "H H * * *"
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ TEST_DATE_STRING:
+ type: string
+ default: "yesterday"
+ description: "Date string for comparison determining deletion of docker container"
diff --git a/jenkins/client/job/fake_test.yml b/jenkins/client/job/fake_test.yml
deleted file mode 100644
index 079651c..0000000
--- a/jenkins/client/job/fake_test.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-parameters:
- jenkins:
- client:
- job:
- gerrit-fake-test:
- name: gerrit-fake-test
- discard:
- build:
- keep_num: 25
- artifact:
- keep_num: 25
- type: workflow-scm
- concurrent: true
- scm:
- type: git
- url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
- credentials: "gerrit"
- script: fake-test-pipeline.groovy
- trigger:
- gerrit:
- project:
- "salt-formulas/salt-formulas":
- branches:
- - master
- event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
- param:
- CREDENTIALS_ID:
- type: string
- default: "gerrit"
diff --git a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
index 0fa0491..fe1edcd 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
@@ -62,7 +62,18 @@
github:
url: "https://github.com/Mirantis/{{name}}"
trigger:
- github:
+ gerrit:
+ project:
+ contrail/{{name}}:
+ branches:
+ - master
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ ref:
+ - updated
param:
SOURCE_URL:
type: string
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 4b6c006..7849adc 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -73,6 +73,16 @@
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
credentials: "gerrit"
script: test-system-reclass-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ salt-models/{{name}}:
+ branches:
+ - master
+ event:
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '(recheck|reverify)'
concurrent: true
param:
TEST_MODELS:
@@ -85,6 +95,9 @@
DEFAULT_GIT_REF:
type: string
default: master
+ PARALLEL_NODE_GROUP_SIZE:
+ type: string
+ default: "5"
test_salt_model_cookiecutter:
name: test-salt-model-cookiecutter-{{cookiecutter_template}}
jobs:
diff --git a/libvirt/server/single.yml b/libvirt/server/single.yml
new file mode 100644
index 0000000..f25f8ed
--- /dev/null
+++ b/libvirt/server/single.yml
@@ -0,0 +1,7 @@
+parameters:
+ linux:
+ system:
+ group:
+ libvirtd:
+ enabled: true
+ name: libvirtd
diff --git a/linux/system/single.yml b/linux/system/single.yml
index ef23a39..e2a8502 100644
--- a/linux/system/single.yml
+++ b/linux/system/single.yml
@@ -6,6 +6,11 @@
parameters:
linux:
system:
+ user:
+ root:
+ enabled: true
+ name: root
+ home: /root
package:
python-msgpack:
version: latest
diff --git a/openssh/server/team/cicd.yml b/openssh/server/team/cicd.yml
new file mode 100644
index 0000000..99f6bd6
--- /dev/null
+++ b/openssh/server/team/cicd.yml
@@ -0,0 +1,19 @@
+classes:
+- system.openssh.server.team.members.akomarek
+- system.openssh.server.team.members.atengler
+- system.openssh.server.team.members.fpytloun
+- system.openssh.server.team.members.jbroulik
+- system.openssh.server.team.members.jcach
+- system.openssh.server.team.members.jjosef
+- system.openssh.server.team.members.jpavlik
+- system.openssh.server.team.members.mpolreich
+- system.openssh.server.team.members.rfelkl
+- system.openssh.server.team.members.tkukral
+- system.openssh.server.team.members.psvimbersky
+
+parameters:
+ _param:
+ linux_system_user_sudo: true
+ openssh:
+ server:
+ enabled: true
diff --git a/openssh/server/team/members/aepifanov.yml b/openssh/server/team/members/aepifanov.yml
index 3c50dfe..be825bc 100644
--- a/openssh/server/team/members/aepifanov.yml
+++ b/openssh/server/team/members/aepifanov.yml
@@ -5,7 +5,7 @@
aepifanov:
enabled: true
name: aepifanov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Andrey Epifanov
home: /home/aepifanov
email: aepifanov@mirantis.com
diff --git a/openssh/server/team/members/aleksandrdobdin.yml b/openssh/server/team/members/aleksandrdobdin.yml
index 6c15522..34abcf4 100644
--- a/openssh/server/team/members/aleksandrdobdin.yml
+++ b/openssh/server/team/members/aleksandrdobdin.yml
@@ -5,7 +5,7 @@
adobdin:
enabled: true
name: adobdin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Aleksandr Dobdin
home: /home/adobdin
email: adobdin@mirantis.com
diff --git a/openssh/server/team/members/aleksandrrubtsov.yml b/openssh/server/team/members/aleksandrrubtsov.yml
index 2746b80..93d26df 100644
--- a/openssh/server/team/members/aleksandrrubtsov.yml
+++ b/openssh/server/team/members/aleksandrrubtsov.yml
@@ -5,7 +5,7 @@
arubtsov:
enabled: true
name: arubtsov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Aleksandr Rubtsov
home: /home/arubtsov
email: arubtsov@mirantis.com
diff --git a/openssh/server/team/members/anatoliineliubin.yml b/openssh/server/team/members/anatoliineliubin.yml
index 665b997..a8b1f21 100644
--- a/openssh/server/team/members/anatoliineliubin.yml
+++ b/openssh/server/team/members/anatoliineliubin.yml
@@ -5,7 +5,7 @@
aneliubin:
enabled: true
name: aneliubin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Anatolii Neliubin
home: /home/aneliubin
email: aneliuubin@mirantis.com
diff --git a/openssh/server/team/members/antonrodionov.yml b/openssh/server/team/members/antonrodionov.yml
index 74ac724..3be1f17 100644
--- a/openssh/server/team/members/antonrodionov.yml
+++ b/openssh/server/team/members/antonrodionov.yml
@@ -5,7 +5,7 @@
arodionov:
enabled: true
name: arodionov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Anton Rodionov
home: /home/arodionov
email: arodionov@mirantis.com
diff --git a/openssh/server/team/members/apetrenko.yml b/openssh/server/team/members/apetrenko.yml
index 7abc8cd..f4fa3d9 100644
--- a/openssh/server/team/members/apetrenko.yml
+++ b/openssh/server/team/members/apetrenko.yml
@@ -5,7 +5,7 @@
apetrenko:
enabled: true
name: apetrenko
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Andrii Petrenko
home: /home/apetrenko
email: apetrenko@mirantis.com
diff --git a/openssh/server/team/members/ashishkin.yml b/openssh/server/team/members/ashishkin.yml
index b85c953..9f74171 100644
--- a/openssh/server/team/members/ashishkin.yml
+++ b/openssh/server/team/members/ashishkin.yml
@@ -5,7 +5,7 @@
ashishkin:
enabled: true
name: ashishkin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Aleksei Shishkin
home: /home/ashishkin
email: ashishkin@mirantis.com
diff --git a/openssh/server/team/members/atarasov.yml b/openssh/server/team/members/atarasov.yml
index 8ada998..935aa91 100644
--- a/openssh/server/team/members/atarasov.yml
+++ b/openssh/server/team/members/atarasov.yml
@@ -5,7 +5,7 @@
atarasov:
enabled: true
name: atarasov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Anton Tarasov
home: /home/atarasov
email: atarasov@mirantis.com
diff --git a/openssh/server/team/members/collinmay.yml b/openssh/server/team/members/collinmay.yml
index f884652..9b29a34 100644
--- a/openssh/server/team/members/collinmay.yml
+++ b/openssh/server/team/members/collinmay.yml
@@ -5,7 +5,7 @@
cmay:
enabled: true
name: cmay
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Collin May
home: /home/cmay
email: cmay@mirantis.com
diff --git a/openssh/server/team/members/daniillapshin.yml b/openssh/server/team/members/daniillapshin.yml
index 56dfa4c..0098977 100644
--- a/openssh/server/team/members/daniillapshin.yml
+++ b/openssh/server/team/members/daniillapshin.yml
@@ -5,7 +5,7 @@
dlapshin:
enabled: true
name: dlapshin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Daniil Lapshin
home: /home/dlapshin
email: dlapshin@mirantis.com
diff --git a/openssh/server/team/members/danilakhmetov.yml b/openssh/server/team/members/danilakhmetov.yml
index a883b4e..47e38d6 100644
--- a/openssh/server/team/members/danilakhmetov.yml
+++ b/openssh/server/team/members/danilakhmetov.yml
@@ -5,7 +5,7 @@
dakhmetov:
enabled: true
name: dakhmetov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Danil Akhmetov
home: /home/dakhmetov
email: dakhmetov@mirantis.com
diff --git a/openssh/server/team/members/deniskostriukov.yml b/openssh/server/team/members/deniskostriukov.yml
index e25514a..26170dc 100644
--- a/openssh/server/team/members/deniskostriukov.yml
+++ b/openssh/server/team/members/deniskostriukov.yml
@@ -5,7 +5,7 @@
dkostriukov:
enabled: true
name: dkostriukov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Denis Kostriukov
home: /home/dkostriukov
email: dkostryukov@mirantis.com
diff --git a/openssh/server/team/members/dklepikov.yml b/openssh/server/team/members/dklepikov.yml
index 6e989c1..fc7b81a 100644
--- a/openssh/server/team/members/dklepikov.yml
+++ b/openssh/server/team/members/dklepikov.yml
@@ -5,7 +5,7 @@
dklepikov:
enabled: true
name: dklepikov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Denys Klepikov
home: /home/dklepikov
email: dklepikov@mirantis.com
diff --git a/openssh/server/team/members/dmitrygoloshubov.yml b/openssh/server/team/members/dmitrygoloshubov.yml
index 1870fac..4509f64 100644
--- a/openssh/server/team/members/dmitrygoloshubov.yml
+++ b/openssh/server/team/members/dmitrygoloshubov.yml
@@ -5,7 +5,7 @@
dgoloshubov:
enabled: true
name: dgoloshubov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Dmitry Goloshubov
home: /home/dgoloshubov
email: dgoloshubov@mirantis.com
diff --git a/openssh/server/team/members/dsutyagin.yml b/openssh/server/team/members/dsutyagin.yml
index 3e332f0..1315772 100644
--- a/openssh/server/team/members/dsutyagin.yml
+++ b/openssh/server/team/members/dsutyagin.yml
@@ -5,7 +5,7 @@
dsutyagin:
enabled: true
name: dsutyagin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Dmitry Sutyagin
home: /home/dsutyagin
email: dsutyagin@mirantis.com
diff --git a/openssh/server/team/members/ekozhemyakin.yml b/openssh/server/team/members/ekozhemyakin.yml
index 607d3c7..afd36c6 100644
--- a/openssh/server/team/members/ekozhemyakin.yml
+++ b/openssh/server/team/members/ekozhemyakin.yml
@@ -5,7 +5,7 @@
ekozhemyakin:
enabled: true
name: ekozhemyakin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Evgeny Kozhemyakin
home: /home/ekozhemyakin
email: ekozhemyakin@mirantis.com
diff --git a/openssh/server/team/members/enikanorov.yml b/openssh/server/team/members/enikanorov.yml
index 4a93b8c..2ea5abc 100644
--- a/openssh/server/team/members/enikanorov.yml
+++ b/openssh/server/team/members/enikanorov.yml
@@ -5,7 +5,7 @@
enikanorov:
enabled: true
name: enikanorov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Eugene Nikanorov
home: /home/enikanorov
email: enikanorov@mirantis.com
diff --git a/openssh/server/team/members/fsoppelsa.yml b/openssh/server/team/members/fsoppelsa.yml
index ec7398a..4478112 100644
--- a/openssh/server/team/members/fsoppelsa.yml
+++ b/openssh/server/team/members/fsoppelsa.yml
@@ -5,7 +5,7 @@
fsoppelsa:
enabled: true
name: fsoppelsa
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Fabrizio Soppelsa
home: /home/fsoppelsa
email: fsoppelsa@mirantis.com
diff --git a/openssh/server/team/members/javierdiaz.yml b/openssh/server/team/members/javierdiaz.yml
index ebdf6dc..8b04645 100644
--- a/openssh/server/team/members/javierdiaz.yml
+++ b/openssh/server/team/members/javierdiaz.yml
@@ -5,7 +5,7 @@
jdiaz:
enabled: true
name: jdiaz
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Javier Diaz
home: /home/jdiaz
email: jdiaz@mirantis.com
diff --git a/openssh/server/team/members/josuepalmerin.yml b/openssh/server/team/members/josuepalmerin.yml
index fdcacbe..3e0d528 100644
--- a/openssh/server/team/members/josuepalmerin.yml
+++ b/openssh/server/team/members/josuepalmerin.yml
@@ -5,7 +5,7 @@
jpalmerin:
enabled: true
name: jpalmerin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Josue Palmerin
home: /home/jpalmerin
email: jpalmerin@mirantis.com
diff --git a/openssh/server/team/members/krzysztoffranckowski.yml b/openssh/server/team/members/krzysztoffranckowski.yml
index 5158f94..454c833 100644
--- a/openssh/server/team/members/krzysztoffranckowski.yml
+++ b/openssh/server/team/members/krzysztoffranckowski.yml
@@ -5,7 +5,7 @@
kfranckowski:
enabled: true
name: kfranckowski
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Krzysztof Franckowski
home: /home/kfranckowski
email: kfranckowski@mirantis.com
diff --git a/openssh/server/team/members/manashkin.yml b/openssh/server/team/members/manashkin.yml
index a28342b..17da835 100644
--- a/openssh/server/team/members/manashkin.yml
+++ b/openssh/server/team/members/manashkin.yml
@@ -5,7 +5,7 @@
manashkin:
enabled: true
name: manashkin
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Miroslav Anashkin
home: /home/manashkin
email: manashkin@mirantis.com
diff --git a/openssh/server/team/members/matthewroark.yml b/openssh/server/team/members/matthewroark.yml
index 97064db..3dc01a6 100644
--- a/openssh/server/team/members/matthewroark.yml
+++ b/openssh/server/team/members/matthewroark.yml
@@ -5,7 +5,7 @@
mroark:
enabled: true
name: mroark
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Matthew Roark
home: /home/mroark
email: mroark@mirantis.com
diff --git a/openssh/server/team/members/maximefimov.yml b/openssh/server/team/members/maximefimov.yml
index 48d0c90..9baaaaf 100644
--- a/openssh/server/team/members/maximefimov.yml
+++ b/openssh/server/team/members/maximefimov.yml
@@ -5,7 +5,7 @@
mefimov:
enabled: true
name: mefimov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Maxim Efimov
home: /home/mefimov
email: mefimov@mirantis.com
diff --git a/openssh/server/team/members/michaelpetersen.yml b/openssh/server/team/members/michaelpetersen.yml
index bab536f..4ac6ee6 100644
--- a/openssh/server/team/members/michaelpetersen.yml
+++ b/openssh/server/team/members/michaelpetersen.yml
@@ -5,7 +5,7 @@
mpetersen:
enabled: true
name: mpetersen
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Michael Petersen
home: /home/mpetersen
email: mpetersen@mirantis.com
diff --git a/openssh/server/team/members/mikhailkraynov.yml b/openssh/server/team/members/mikhailkraynov.yml
index 39c58e6..a7a2d95 100644
--- a/openssh/server/team/members/mikhailkraynov.yml
+++ b/openssh/server/team/members/mikhailkraynov.yml
@@ -5,7 +5,7 @@
mkraynov:
enabled: true
name: mkraynov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Mikhail Kraynov
home: /home/mkraynov
email: mkraynov@mirantis.com
diff --git a/openssh/server/team/members/nadezhdakabanova.yml b/openssh/server/team/members/nadezhdakabanova.yml
index dee01e0..58d2ed3 100644
--- a/openssh/server/team/members/nadezhdakabanova.yml
+++ b/openssh/server/team/members/nadezhdakabanova.yml
@@ -5,7 +5,7 @@
nkabanova:
enabled: true
name: nkabanova
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Nadezhda Kabanova
home: /home/nkabanova
email: nkabanova@mirantis.com
diff --git a/openssh/server/team/members/nkondra.yml b/openssh/server/team/members/nkondra.yml
index a6437de..b250e2b 100644
--- a/openssh/server/team/members/nkondra.yml
+++ b/openssh/server/team/members/nkondra.yml
@@ -5,7 +5,7 @@
nkondra:
enabled: true
name: nkondra
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Nazarii Kondra
home: /home/nkondra
email: nkondra@mirantis.com
diff --git a/openssh/server/team/members/obryndzii.yml b/openssh/server/team/members/obryndzii.yml
index db0f630..9f7498c 100644
--- a/openssh/server/team/members/obryndzii.yml
+++ b/openssh/server/team/members/obryndzii.yml
@@ -5,7 +5,7 @@
obryndzii:
enabled: true
name: obryndzii
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Oleksandr Bryndzii
home: /home/obryndzii
email: obryndzii@mirantis.com
diff --git a/openssh/server/team/members/oliemieshko.yml b/openssh/server/team/members/oliemieshko.yml
index 5050d53..ec8d8d6 100644
--- a/openssh/server/team/members/oliemieshko.yml
+++ b/openssh/server/team/members/oliemieshko.yml
@@ -5,7 +5,7 @@
oliemieshko:
enabled: true
name: oliemieshko
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Oleksandr Liemieshko
home: /home/oliemieshko
email: oliemieshko@mirantis.com
diff --git a/openssh/server/team/members/renesoto.yml b/openssh/server/team/members/renesoto.yml
index 9fcace6..a9988ed 100644
--- a/openssh/server/team/members/renesoto.yml
+++ b/openssh/server/team/members/renesoto.yml
@@ -5,7 +5,7 @@
rsoto:
enabled: true
name: rsoto
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Rene Soto
home: /home/rsoto
email: rsoto@mirantis.com
diff --git a/openssh/server/team/members/rsafonov.yml b/openssh/server/team/members/rsafonov.yml
index 3409c92..9965a1b 100644
--- a/openssh/server/team/members/rsafonov.yml
+++ b/openssh/server/team/members/rsafonov.yml
@@ -5,7 +5,7 @@
rsafonov:
enabled: true
name: rsafonov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Roman Safonov
home: /home/rsafonov
email: rsafonov@mirantis.com
diff --git a/openssh/server/team/members/scottmachtmes.yml b/openssh/server/team/members/scottmachtmes.yml
index a08b3a7..369db34 100644
--- a/openssh/server/team/members/scottmachtmes.yml
+++ b/openssh/server/team/members/scottmachtmes.yml
@@ -5,7 +5,7 @@
smachtmes:
enabled: true
name: smachtmes
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Scott Machtmes
home: /home/smachtmes
email: smachtmes@mirantis.com
diff --git a/openssh/server/team/members/sovsianikov.yml b/openssh/server/team/members/sovsianikov.yml
index cb82cc9..d5a2fed 100644
--- a/openssh/server/team/members/sovsianikov.yml
+++ b/openssh/server/team/members/sovsianikov.yml
@@ -5,7 +5,7 @@
sovsianikov:
enabled: true
name: sovsianikov
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Serhii Ovsianikov
home: /home/sovsianikov
email: sovsianikov@mirantis.com
diff --git a/openssh/server/team/members/zahedkhurasani.yml b/openssh/server/team/members/zahedkhurasani.yml
index df1a94d..f5411fd 100644
--- a/openssh/server/team/members/zahedkhurasani.yml
+++ b/openssh/server/team/members/zahedkhurasani.yml
@@ -5,7 +5,7 @@
zkhurasani:
enabled: true
name: zkhurasani
- sudo: false
+ sudo: ${_param:linux_system_user_sudo}
full_name: Zahed Khurasani
home: /home/zkhurasani
email: zkhurasani@mirantis.com
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index f64d69c..d912490 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -1,3 +1,8 @@
+classes:
+- system.openssh.server.team.members.mceloud
+- system.openssh.server.team.members.pjediny
+- system.openssh.server.team.members.skreys
+- system.openssh.server.team.members.smatov
parameters:
_param:
linux_system_user_sudo: true
diff --git a/reclass/storage/system/ceph_mon_cluster.yml b/reclass/storage/system/ceph_mon_cluster.yml
new file mode 100644
index 0000000..6b99d21
--- /dev/null
+++ b/reclass/storage/system/ceph_mon_cluster.yml
@@ -0,0 +1,38 @@
+parameters:
+ _param:
+ ceph_mon_node01_hostname: cmn01
+ ceph_mon_node02_hostname: cmn02
+ ceph_mon_node03_hostname: cmn03
+ reclass:
+ storage:
+ node:
+ ceph_mon_node01:
+ name: ${_param:ceph_mon_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.mon
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ single_address: ${_param:ceph_mon_node01_address}
+ keepalived_vip_priority: 103
+ ceph_mon_node02:
+ name: ${_param:ceph_mon_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.mon
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ single_address: ${_param:ceph_mon_node02_address}
+ keepalived_vip_priority: 102
+ ceph_mon_node03:
+ name: ${_param:ceph_mon_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.mon
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ single_address: ${_param:ceph_mon_node03_address}
+ keepalived_vip_priority: 101
diff --git a/reclass/storage/system/ceph_monitor_cluster.yml b/reclass/storage/system/ceph_monitor_cluster.yml
deleted file mode 100644
index ca7e7ff..0000000
--- a/reclass/storage/system/ceph_monitor_cluster.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-parameters:
- _param:
- ceph_monitor_node01_hostname: cmn01
- ceph_monitor_node02_hostname: cmn02
- ceph_monitor_node03_hostname: cmn03
- reclass:
- storage:
- node:
- ceph_monitor_node01:
- name: ${_param:ceph_monitor_node01_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.ceph.monitor
- params:
- salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
- single_address: ${_param:ceph_monitor_node01_address}
- keepalived_vip_priority: 103
- ceph_monitor_node02:
- name: ${_param:ceph_monitor_node02_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.ceph.monitor
- params:
- salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
- single_address: ${_param:ceph_monitor_node02_address}
- keepalived_vip_priority: 102
- ceph_monitor_node03:
- name: ${_param:ceph_monitor_node03_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.ceph.monitor
- params:
- salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
- single_address: ${_param:ceph_monitor_node03_address}
- keepalived_vip_priority: 101
diff --git a/reclass/storage/system/openstack_dns_cluster.yml b/reclass/storage/system/openstack_dns_cluster.yml
index d134c88..d671e78 100644
--- a/reclass/storage/system/openstack_dns_cluster.yml
+++ b/reclass/storage/system/openstack_dns_cluster.yml
@@ -12,7 +12,7 @@
- cluster.${_param:cluster_name}.openstack.dns
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: xenial
single_address: ${_param:openstack_dns_node01_address}
keepalived_vip_priority: 110
openstack_dns_node02:
@@ -22,6 +22,6 @@
- cluster.${_param:cluster_name}.openstack.dns
params:
salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: trusty
+ linux_system_codename: xenial
single_address: ${_param:openstack_dns_node02_address}
keepalived_vip_priority: 111