summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-12-01 00:24:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-01 00:24:14 +0000
commit5a6ac42f278fbe793375c03462d74f80c1527a5a (patch)
treedb2b773e0d84dc41f80be070f0f5256ad9e82a75
parentf27da77b87837e025907f689890b413c8f183c59 (diff)
parent7e37d85e8e935ca423526ee5327afe9558f9e25e (diff)
Merge "Fixes inserting ceph OSD into compute role"
-rw-r--r--lib/ansible/playbooks/deploy_overcloud.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index 4d55c8f..b2d9234 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