summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml6
-rw-r--r--deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml8
-rw-r--r--deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_RedHat.yml8
-rw-r--r--deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml7
4 files changed, 15 insertions, 14 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 5b958b73..ac2f2a8d 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -56,10 +56,14 @@
roles:
- ext-network
+- hosts: ceph
+ remote_user: root
+ sudo: True
+ roles:
+ - ceph-deploy
- hosts: all
remote_user: root
sudo: True
roles:
- - ceph-deploy
- monitor
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 65e7aa17..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
@@ -22,21 +22,21 @@
- name: copy create_osd.sh to other nodes
shell: scp -o StrictHostKeyChecking=no ~/create_osd.sh {{ item }}:~/
with_items:
- - "{{ groups['controller'] }}"
+ - "{{ groups['compute'] }}"
tags:
- create_osd
- name: create osd
shell: ssh -o StrictHostKeyChecking=no -t {{ item }} "~/create_osd.sh"
with_items:
- - "{{ groups['controller'] }}"
+ - "{{ groups['compute'] }}"
tags:
- create_osd
- name: prepare create osd
shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy osd prepare {{ item }}:/var/local/osd
with_items:
- - "{{ groups['controller'] }}"
+ - "{{ groups['compute'] }}"
tags:
- create_osd
@@ -44,7 +44,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['controller'] }}"
+ - "{{ groups['compute'] }}"
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 65455392..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
@@ -22,21 +22,21 @@
- name: copy create_osd.sh to other nodes
shell: scp -o StrictHostKeyChecking=no ~/create_osd.sh {{ item }}:~/
with_items:
- - "{{ groups['controller'] }}"
+ - "{{ groups['compute'] }}"
tags:
- create_osd
- name: create osd
shell: ssh -o StrictHostKeyChecking=no -t {{ item }} "~/create_osd.sh"
with_items:
- - "{{ groups['controller'] }}"
+ - "{{ groups['compute'] }}"
tags:
- create_osd
- name: prepare create osd
shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy --repo-url http://10.1.0.12/cblr/repo_mirror/centos7-juno-ppa --gpg-url http://10.1.0.12/cblr/repo_mirror/centos7-juno-ppa/ceph_key_release.asc osd prepare {{ item }}:/var/local/osd
with_items:
- - "{{ groups['controller'] }}"
+ - "{{ groups['compute'] }}"
tags:
- create_osd
@@ -44,7 +44,7 @@
- name: activate osd
shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy --repo-url http://10.1.0.12/cblr/repo_mirror/centos7-juno-ppa --gpg-url http://10.1.0.12/cblr/repo_mirror/centos7-juno-ppa/ceph_key_release.asc osd activate {{ item }}:/var/local/osd
with_items:
- - "{{ groups['controller'] }}"
+ - "{{ groups['compute'] }}"
tags:
- create_osd
- activate_osd
diff --git a/deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml b/deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml
index b50b38c8..75ed1da2 100644
--- a/deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml
@@ -1,32 +1,29 @@
---
- include: ceph_setup_env.yml
- when: inventory_hostname == "{{ groups['controller'][0] }}"
tags:
- ceph_deploy
- ceph_setup_env
- ceph_install
- include: ceph_install_Debian.yml
- when: inventory_hostname == groups['controller'][0] and ansible_os_family == "Debian"
+ when: ansible_os_family == "Debian"
tags:
- ceph_deploy
- ceph_install
- include: ceph_install_RedHat.yml
- when: inventory_hostname == groups['controller'][0] and ansible_os_family == "RedHat"
+ when: ansible_os_family == "RedHat"
tags:
- ceph_deploy
- ceph_install
- include: ceph_openstack_pre.yml
- when: inventory_hostname == "{{ groups['controller'][0] }}"
tags:
- ceph_deploy
- ceph_openstack_pre
- ceph_openstack
- include: ceph_openstack_conf.yml
- when: inventory_hostname == "{{ groups['controller'][0] }}"
tags:
- ceph_deploy
- ceph_openstack_conf