diff options
| -rw-r--r-- | apex/undercloud/undercloud.py | 1 | ||||
| -rw-r--r-- | lib/ansible/playbooks/deploy_overcloud.yml | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index 14be4401..013570d3 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -193,6 +193,7 @@ class Undercloud: "enable_ui false", "undercloud_update_packages false", "undercloud_debug false", + "inspection_extras false", "undercloud_hostname undercloud.{}".format(ns['dns-domain']), "local_ip {}/{}".format(str(ns_admin['installer_vm']['ip']), str(ns_admin['cidr']).split('/')[1]), 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 |