diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-11-29 17:12:27 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-11-30 13:37:35 -0500 |
| commit | 7e37d85e8e935ca423526ee5327afe9558f9e25e (patch) | |
| tree | 5a7a8be5cf7a93bc0c3793012a923b8fe03d309a | |
| parent | 33aebc3b51ce4bc816499a8b68a7feca77a12c6c (diff) | |
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>
| -rw-r--r-- | lib/ansible/playbooks/deploy_overcloud.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml index 4d55c8fc..b2d9234a 100644 --- a/lib/ansible/playbooks/deploy_overcloud.yml +++ b/lib/ansible/playbooks/deploy_overcloud.yml @@ -35,10 +35,18 @@ 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 - insertbefore: 'OS::TripleO::Services::NovaCompute' + insertbefore: '^\s*-\sOS::TripleO::Services::NovaCompute$' line: ' - OS::TripleO::Services::CephOSD' owner: root group: root |