-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Disassociate the specific role names from their purpose. Considering that multiple roles can be assigned to a minion, applying a ceph-osd profile to a gateway or having identical profiles for each role is unnecessary. Signed-off-by: Eric Jackson <[email protected]>
- Loading branch information
Showing
25 changed files
with
106 additions
and
218 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,11 @@ | ||
| Apply mgr tuned states: | ||
| salt.state: | ||
| - tgt: 'I@roles:mgr and I@cluster:ceph' | ||
| - tgt_type: compound | ||
| - sls: ceph.tuned.mgr | ||
|
|
||
| Apply mon tuned states: | ||
| Apply latency tuned states: | ||
| salt.state: | ||
| - tgt: 'I@roles:mon and I@cluster:ceph' | ||
| - tgt_type: compound | ||
| - sls: ceph.tuned.mon | ||
| - sls: ceph.tuned.latency | ||
|
|
||
| Apply osd tuned states: | ||
| Apply throughput tuned states: | ||
| salt.state: | ||
| - tgt: 'I@roles:storage and I@cluster:ceph' | ||
| - tgt_type: compound | ||
| - sls: ceph.tuned.osd | ||
|
|
||
| Check tuned for ses roles: | ||
| salt.state: | ||
| - tgt: "I@roles:storage or I@roles:mon or I@roles:mgr" | ||
| - tgt_type: compound | ||
| - sls: ceph.tests.tuned | ||
| - sls: ceph.tuned.throughput |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
|
|
||
| /etc/tuned/ceph-latency/tuned.conf: | ||
| file.managed: | ||
| - source: salt://ceph/tuned/files/latency.conf | ||
| - makedirs: True | ||
| - user: root | ||
| - group: root | ||
| - mode: 644 | ||
|
|
||
| start tuned for latency profile: | ||
| service.running: | ||
| - name: tuned | ||
| - enable: True | ||
|
|
||
| apply latency profile: | ||
| cmd.run: | ||
| - name: 'tuned-adm profile ceph-latency' | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
|
|
||
| tuned latency nop: | ||
| test.nop |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
|
|
||
| include: | ||
| - .{{ salt['pillar.get']('tuned_latency', 'default') }} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
|
|
||
| stop tuned: | ||
| service.dead: | ||
| - name: tuned | ||
| - enable: False | ||
|
|
||
| /etc/tuned/ceph-latency/: | ||
| file.absent | ||
|
|
||
| /etc/tuned/ceph-throughput/: | ||
| file.absent | ||
|
|
||
| /etc/tuned/ceph-mon/: | ||
| file.absent | ||
|
|
||
| /etc/tuned/ceph-mgr/: | ||
| file.absent | ||
|
|
||
| /etc/tuned/ceph-osd/: | ||
| file.absent | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
|
|
||
| include: | ||
| - .{{ salt['pillar.get']('tuned_off', 'default') }} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.