aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2015-11-06 01:19:24 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-11-06 01:19:24 +0000
commit525a683d55f11d41a18403fb0db620843a101ba1 (patch)
tree11dc98d205983a9fe064837ba550e2b14f685893
parent9359903f4dfd2ace530596d72ba26e3c1266f66f (diff)
parent9921e07ff7a4dfc30c76207fa0c1ccf95f867963 (diff)
Merge "change ceph deployment to optional role"
-rw-r--r--deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml6
-rw-r--r--deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml7
2 files changed, 7 insertions, 6 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/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