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>

diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 5b958b7..ac2f2a8 100644 (file)
--- 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 b50b38c..75ed1da 100644 (file)
--- 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