Merge "Approve xml parsing related methods"
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/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..4c5228f 100644
--- a/linux/system/single.yml
+++ b/linux/system/single.yml
@@ -6,8 +6,13 @@
parameters:
linux:
system:
+ user:
+ root:
+ enabled: true
+ name: root
+ home: /root
package:
- python-msgpack:
+ python-msgpack:
version: latest
cloud-init:
version: purged
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/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