diff options
| author |   Justin chi <chigang@huawei.com> | 2015-11-06 01:20:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-11-06 01:20:27 +0000 |
| commit | 793809d04553f3acae27f3d9ca386ddebecc704e (patch) | |
| tree | 2ace09c619b3c91a5e8a12bf71f3367867d2ae97 /deploy/adapters/ansible | |
| parent | 525a683d55f11d41a18403fb0db620843a101ba1 (diff) | |
| parent | 22d0a715c27523194af870d633852910cd26279f (diff) | |
Merge "[ceph]deploy mon nodes on controller nodes"
Diffstat (limited to 'deploy/adapters/ansible')
3 files changed, 26 insertions, 2 deletions
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 27543602..3959d466 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 {{ ceph_cluster_hosts.stdout_lines[0] }} + shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy new {{ controller_nodes.stdout_lines[0] }} tags: - create_ceph_cluster 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 04ab1b5b..97d925d6 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 {{ ceph_cluster_hosts.stdout_lines[0] }} + shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy new {{ controller_nodes.stdout_lines[0] }} tags: - create_ceph_cluster 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 cacc48d8..f89e2c6d 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 @@ -25,6 +25,13 @@ - create_ceph_cluster - ceph_install +- name: clear cluster_controller_nodes + file: path=cluster_controller_nodes state=absent + tags: + - create_ceph_cluster + - ceph_install + + - name: echo hosts name to file shell: echo -n "{{ item }} " >> cluster_hosts_name with_items: @@ -41,6 +48,23 @@ - echo_hosts - ceph_install +- name: echo controller name to file + shell: echo -n "{{ item }} " >> cluster_controller_nodes + with_items: + - "{{ groups['controller'] }}" + tags: + - create_ceph_cluster + - ceph_install + +- name: register controller nodes + shell: cat cluster_controller_nodes + register: controller_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 |