Skip to content

Commit 5f48a6c

Browse files
authored
Merge pull request #499 from b1-systems/os/debian10
Support pcs 0.10 syntax and Debian family with `pcs`
2 parents cd23c0a + 2603790 commit 5f48a6c

31 files changed

+663
-574
lines changed

REFERENCE.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,19 +1387,6 @@ A hash of metadata for the master/slave primitive state.
13871387

13881388
Default value: Hash.new
13891389

1390-
##### `promotable`
1391-
1392-
Valid values: `true`, `false`
1393-
1394-
Designates if the primitive is capable of being managed in a master/slave
1395-
state. This will create a new ms resource in your Corosync config and add
1396-
this primitive to it. Concequently Corosync will be helpful and update all
1397-
your colocation and order resources too but Puppet won't. Currenlty we unmunge
1398-
configuraiton entries that start with ms_ so that you don't have to account for
1399-
name change in all our manifests.
1400-
1401-
Default value: false
1402-
14031390
#### Parameters
14041391

14051392
The following parameters are available in the `cs_primitive` type.

data/common.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
corosync::package_fence_agents: false
3+
corosync::qdevice::provider: "%{alias('corosync::provider')}"

data/os/Debian.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
corosync::provider: 'pcs'
3+
corosync::pcs_version: '0.10.0'

data/os/Debian/9.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
corosync::provider: 'crm'
3+
corosync::pcs_version: ~

data/os/RedHat.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
corosync::provider: 'pcs'
3+
corosync::pcs_version: '0.10.0'
4+
corosync::package_fence_agents: true

data/os/RedHat/7.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
corosync::pcs_version: '0.9.0'

data/os/SLES.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
corosync::provider: 'crm'
3+
corosync::pcs_version: ~

data/os/Ubuntu.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
corosync::pcs_version: '0.10.0'
3+
corosync::provider: 'pcs'

data/os/Ubuntu/18.04.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
corosync::pcs_version: '0.9.0'

hiera.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 5
2+
3+
defaults: # Used for any hierarchy level that omits these keys.
4+
datadir: data # This path is relative to hiera.yaml's directory.
5+
data_hash: yaml_data # Use the built-in YAML backend.
6+
7+
hierarchy:
8+
- name: "osfamily/major release"
9+
paths:
10+
# Used to distinguish between Debian and Ubuntu
11+
- "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
12+
- "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
13+
- name: "osfamily"
14+
paths:
15+
- "os/%{facts.os.name}.yaml"
16+
- "os/%{facts.os.family}.yaml"
17+
- name: 'common'
18+
path: 'common.yaml'

0 commit comments

Comments
 (0)