From 9921e07ff7a4dfc30c76207fa0c1ccf95f867963 Mon Sep 17 00:00:00 2001 From: graiss Date: Thu, 5 Nov 2015 14:50:17 +0800 Subject: change ceph deployment to optional role JIRA: COMPASS-123 - ceph deployment is optional now Change-Id: I542d861b89e9cc71572f4a0f41bf6f04e74eda6e Signed-off-by: graiss --- deploy/adapters/ansible/roles/ceph-deploy/tasks/main.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'deploy/adapters/ansible/roles/ceph-deploy') 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 -- cgit 1.2.3-korg