summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2015-11-28 06:28:51 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-11-28 06:28:51 +0000
commit59450840d28991bef93ffe893fd5cde4173c1ad2 (patch)
treef5cbb5da5ebc5173e3d317af2a57e9a7ac1caeea
parentdfea1e345723f77a450eac20c6e0f7d03067cee0 (diff)
parent2f0dbdd9c8bb49b66054f08cce93e8ab4825f873 (diff)
Merge "split ceph into small size roles with specific purpose"
-rw-r--r--deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml2
-rw-r--r--deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml10
-rw-r--r--deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml10
-rw-r--r--deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_setup_env.yml20
-rw-r--r--deploy/conf/virtual_cluster.yml7
5 files changed, 37 insertions, 12 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index d3cec000..58774e4b 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -56,7 +56,7 @@
roles:
- ext-network
-- hosts: ceph
+- hosts: ceph_adm
remote_user: root
sudo: True
roles:
diff --git a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml
index 744120b8..7c9545ef 100644
--- a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml
+++ b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml
@@ -1,6 +1,6 @@
---
- name: create ceph cluster
- shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy new {{ controller_nodes.stdout_lines[0] }}
+ shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy new {{ mon_nodes.stdout_lines[0] }}
tags:
- create_ceph_cluster
@@ -25,21 +25,21 @@
- name: copy create_osd.sh to other nodes
shell: scp -o StrictHostKeyChecking=no ~/create_osd.sh {{ item }}:~/
with_items:
- - "{{ groups['compute'] }}"
+ - "{{ groups['ceph_osd'] }}"
tags:
- create_osd
- name: create osd
shell: ssh -o StrictHostKeyChecking=no -t {{ item }} "~/create_osd.sh"
with_items:
- - "{{ groups['compute'] }}"
+ - "{{ groups['ceph_osd'] }}"
tags:
- create_osd
- name: prepare create osd
shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy osd prepare {{ item }}:/var/local/osd
with_items:
- - "{{ groups['compute'] }}"
+ - "{{ groups['ceph_osd'] }}"
tags:
- create_osd
@@ -47,7 +47,7 @@
- name: activate osd
shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy osd activate {{ item }}:/var/local/osd && ceph-deploy osd activate {{ item }}:/var/local/osd
with_items:
- - "{{ groups['compute'] }}"
+ - "{{ groups['ceph_osd'] }}"
tags:
- create_osd
- activate_osd
diff --git a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml
index 385c7571..d907170f 100644
--- a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml
+++ b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml
@@ -1,6 +1,6 @@
---
- name: create ceph cluster
- shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy new {{ controller_nodes.stdout_lines[0] }}
+ shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy new {{ mon_nodes.stdout_lines[0] }}
tags:
- create_ceph_cluster
@@ -25,21 +25,21 @@
- name: copy create_osd.sh to other nodes
shell: scp -o StrictHostKeyChecking=no ~/create_osd.sh {{ item }}:~/
with_items:
- - "{{ groups['compute'] }}"
+ - "{{ groups['ceph_osd'] }}"
tags:
- create_osd
- name: create osd
shell: ssh -o StrictHostKeyChecking=no -t {{ item }} "~/create_osd.sh"
with_items:
- - "{{ groups['compute'] }}"
+ - "{{ groups['ceph_osd'] }}"
tags:
- create_osd
- name: prepare create osd
shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy osd prepare {{ item }}:/var/local/osd
with_items:
- - "{{ groups['compute'] }}"
+ - "{{ groups['ceph_osd'] }}"
tags:
- create_osd
@@ -47,7 +47,7 @@
- name: activate osd
shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy osd activate {{ item }}:/var/local/osd
with_items:
- - "{{ groups['compute'] }}"
+ - "{{ groups['ceph_osd'] }}"
tags:
- create_osd
- activate_osd
diff --git a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_setup_env.yml b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_setup_env.yml
index f89e2c6d..0f3ad60c 100644
--- a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_setup_env.yml
+++ b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_setup_env.yml
@@ -31,6 +31,11 @@
- create_ceph_cluster
- ceph_install
+- name: clear ceph_mon_nodes
+ file: path=ceph_mon_nodes state=absent
+ tags:
+ - create_ceph_cluster
+ - ceph_install
- name: echo hosts name to file
shell: echo -n "{{ item }} " >> cluster_hosts_name
@@ -64,6 +69,21 @@
- echo_hosts
- ceph_install
+- name: echo ceph-mon name to file
+ shell: echo -n "{{ item }} " >> ceph_mon_nodes
+ with_items:
+ - "{{ groups['ceph_mon'] }}"
+ tags:
+ - create_ceph_cluster
+ - ceph_install
+
+- name: register ceph-mon nodes
+ shell: cat ceph_mon_nodes
+ register: mon_nodes
+ tags:
+ - create_ceph_cluster
+ - echo_hosts
+ - ceph_install
- name: gen clean ceph script
template: src=clean_ceph.j2 dest=~/clean_ceph.sh mode=0777
diff --git a/deploy/conf/virtual_cluster.yml b/deploy/conf/virtual_cluster.yml
index 6ee8c95c..aa2a1b3e 100644
--- a/deploy/conf/virtual_cluster.yml
+++ b/deploy/conf/virtual_cluster.yml
@@ -6,22 +6,27 @@ hosts:
roles:
- controller
- ha
- - ceph
+ - ceph-adm
+ - ceph-mon
- name: host2
roles:
- controller
- ha
+ - ceph-mon
- name: host3
roles:
- controller
- ha
+ - ceph-mon
- name: host4
roles:
- compute
+ - ceph-osd
- name: host5
roles:
- compute
+ - ceph-osd