Fixes inserting ceph OSD into compute role

The lineinfile was not actually inserting the CephOSD line because it
was already present later in the file (regardless of 'insertbefore').
Therefore we can fix it by simply removing the CephOSD line before we
try to set it, since we do not need it in the storage role anyway.

Change-Id: I8c8d9b6baccfc77ea582fab6ad438b02293f96fb
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index 4d55c8f..b2d9234 100644 (file)
--- a/lib/ansible/playbooks/deploy_overcloud.yml
+++ b/lib/ansible/playbooks/deploy_overcloud.yml
@@ -35,10 +35,18 @@
         state: restarted
         enabled: yes
       become: yes
         state: restarted
         enabled: yes
       become: yes

+    - name: Remove Ceph OSD from ceph storage role
+      lineinfile:
+        path: /usr/share/openstack-tripleo-heat-templates/roles_data.yaml
+        line: '    - OS::TripleO::Services::CephOSD'
+        owner: root
+        group: root
+        state: absent
+      become: yes

     - name: Insert Ceph OSDs into Compute role
       lineinfile:
         path: /usr/share/openstack-tripleo-heat-templates/roles_data.yaml
     - name: Insert Ceph OSDs into Compute role
       lineinfile:
         path: /usr/share/openstack-tripleo-heat-templates/roles_data.yaml

-        insertbefore: 'OS::TripleO::Services::NovaCompute'
+        insertbefore:  '^\s*-\sOS::TripleO::Services::NovaCompute$'

         line: '    - OS::TripleO::Services::CephOSD'
         owner: root
         group: root
         line: '    - OS::TripleO::Services::CephOSD'
         owner: root
         group: root