summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible
diff options
context:
space:
mode:
authorgraiss <grakiss.wanglei@huawei.com>2015-11-05 14:50:17 +0800
committergraiss <grakiss.wanglei@huawei.com>2015-11-05 14:50:17 +0800
commit9921e07ff7a4dfc30c76207fa0c1ccf95f867963 (patch)
tree691c47dc949d4ce567bd5cff7a3db5374400829b /deploy/adapters/ansible
parentce4cf93c1f0e3ee58cb8a99000c28b64521d4de0 (diff)
change ceph deployment to optional role
JIRA: COMPASS-123 - ceph deployment is optional now Change-Id: I542d861b89e9cc71572f4a0f41bf6f04e74eda6e Signed-off-by: graiss <grakiss.wanglei@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible')
-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