diff options
Diffstat (limited to 'deploy/adapters/ansible')
4 files changed, 31 insertions, 11 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 |