ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1945 from ceph/mgr-siteuh 

[skip ci] Mgr siteuh
pull/1946/head
Sébastien Han 2017-09-22 18:50:12 +02:00 committed by GitHub
parent 1ea3ec1790 8f71c08e7b
commit 595be95d08
19 changed files with 67 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-defaults/templates/restart_osd_daemon.sh.j2
View File

@ -16,7 +16,7 @@ check_pgs() {
echo "Error while running 'ceph $CEPH_CLI -s', PGs were not reported as active+clean" echo "Error while running 'ceph $CEPH_CLI -s', PGs were not reported as active+clean"
echo "It is possible that the cluster has less OSDs than the replica configuration" echo "It is possible that the cluster has less OSDs than the replica configuration"
echo "Will refuse to continue" echo "Will refuse to continue"
$docker_exec ceph "$CEPH_CLI" -s $docker_exec ceph $CEPH_CLI -s
exit 1 exit 1
} }

18
site-docker.yml.sample
View File

@ -33,6 +33,15 @@
- ceph-mon - ceph-mon
serial: 1 # MUST be '1' WHEN DEPLOYING MONITORS ON DOCKER CONTAINERS serial: 1 # MUST be '1' WHEN DEPLOYING MONITORS ON DOCKER CONTAINERS
- hosts: mgrs
become: True
gather_facts: false
roles:
- { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- hosts: osds - hosts: osds
become: True become: True
gather_facts: false gather_facts: false
@ -87,15 +96,6 @@
- ceph-config - ceph-config
- ceph-restapi - ceph-restapi
- hosts: mgrs
become: True
gather_facts: false
roles:
- { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- hosts: clients - hosts: clients
become: True become: True
gather_facts: false gather_facts: false

18
site.yml.sample
View File

@ -61,6 +61,15 @@
- ceph-config - ceph-config
- ceph-mon - ceph-mon
- hosts: mgrs
gather_facts: false
become: True
roles:
- { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- hosts: agents - hosts: agents
gather_facts: false gather_facts: false
become: True become: True
@ -133,15 +142,6 @@
- ceph-config - ceph-config
- ceph-client - ceph-client
- hosts: mgrs
gather_facts: false
become: True
roles:
- { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
- hosts: iscsi_gws - hosts: iscsi_gws
gather_facts: false gather_facts: false
become: True become: True

6
tests/functional/centos/7/bluestore/hosts
View File

@ -3,6 +3,9 @@ mon0 monitor_address=192.168.1.10
mon1 monitor_interface=eth1 mon1 monitor_interface=eth1
mon2 monitor_address=192.168.1.12 mon2 monitor_address=192.168.1.12
[mgrs]
mon0
[osds] [osds]
osd0 osd0
@ -14,6 +17,3 @@ rgw0
[clients] [clients]
client0 client0
[mgrs]
mon0

6
tests/functional/centos/7/bs-crypt-ded-jrn/hosts
View File

@ -1,8 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0
[mgrs]
mon0

6
tests/functional/centos/7/bs-crypt-jrn-col/hosts
View File

@ -1,8 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0
[mgrs]
mon0

6
tests/functional/centos/7/bs-dock-ded-jrn/hosts
View File

@ -1,8 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0
[mgrs]
mon0

6
tests/functional/centos/7/bs-jrn-col/hosts
View File

@ -1,8 +1,8 @@
[mons] [mons]
mon0 monitor_interface=eth1 mon0 monitor_interface=eth1
[osds]
osd0
[mgrs] [mgrs]
mon0 mon0
[osds]
osd0

6
tests/functional/centos/7/cluster/hosts
View File

@ -3,6 +3,9 @@ ceph-mon0 monitor_address=192.168.1.10
ceph-mon1 monitor_interface=eth1 ceph-mon1 monitor_interface=eth1
ceph-mon2 monitor_address=192.168.1.12 ceph-mon2 monitor_address=192.168.1.12
[mgrs]
ceph-mgr0
[osds] [osds]
ceph-osd0 ceph-osd0
@ -15,9 +18,6 @@ ceph-rgw0
[clients] [clients]
ceph-client0 ceph-client0
[mgrs]
ceph-mgr0
[nfss] [nfss]
ceph-nfs0 ceph-nfs0

6
tests/functional/centos/7/crypt-ded-jrn/hosts
View File

@ -1,8 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0
[mgrs]
mon0

6
tests/functional/centos/7/crypt-jrn-col/hosts
View File

@ -1,8 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0
[mgrs]
mon0

6
tests/functional/centos/7/docker-crypt-jrn-col/hosts
View File

@ -1,8 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0
[mgrs]
mon0

6
tests/functional/centos/7/docker-ded-jrn/hosts
View File

@ -1,8 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0
[mgrs]
mon0

6
tests/functional/centos/7/docker/hosts
View File

@ -3,6 +3,9 @@ mon0
mon1 mon1
mon2 mon2
[mgrs]
mgr0
[osds] [osds]
osd0 osd0
@ -12,9 +15,6 @@ mds0
[rgws] [rgws]
rgw0 rgw0
[mgrs]
mgr0
[nfss] [nfss]
nfs0 nfs0

3
tests/functional/centos/7/jrn-col-auto-dm/hosts
View File

@ -1,5 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0

3
tests/functional/centos/7/jrn-col-auto/hosts
View File

@ -1,5 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0

6
tests/functional/centos/7/jrn-col/hosts
View File

@ -1,8 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0
[mgrs]
mon0

6
tests/functional/centos/7/lvm-osds/hosts
View File

@ -1,8 +1,8 @@
[mons] [mons]
mon0 mon0
[mgrs]
mon0
[osds] [osds]
osd0 osd0
[mgrs]
mon0

6
tests/functional/ubuntu/16.04/cluster/hosts
View File

@ -3,6 +3,9 @@ mon0 monitor_address=192.168.5.10
mon1 monitor_address=192.168.5.11 mon1 monitor_address=192.168.5.11
mon2 monitor_address=192.168.5.12 mon2 monitor_address=192.168.5.12
[mgrs]
mgr0
[osds] [osds]
osd0 osd0
@ -15,8 +18,5 @@ rgw0
[clients] [clients]
client0 client0
[mgrs]
mgr0
[nfss] [nfss]
nfs0 nfs0