summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
2c26b89)
There was an issue with patching the overcloud where the patch binary is
missing, making it impossible to apply patches. This change install
patch now on the image.
Also, although deployments were successful, storage was not working.
This is because by default upstream does not apply Ceph OSDs to compute
nodes for hyperconverged Ceph, but we use this as our standard
deployment in Apex. This patch inserts CephOSD into the default Compute
role. Note: we normally override role's services in regular Apex
deployments so we do not hit this issue there.
Change-Id: I5bddda4784dc00148395863ae0990343a4159602
Signed-off-by: Tim Rozet <trozet@redhat.com>
in patch)
:return: None
"""
in patch)
:return: None
"""
+ virt_ops = [{con.VIRT_INSTALL: 'patch'}]
logging.debug("Evaluating upstream patches:\n{}".format(patches))
for patch in patches:
assert isinstance(patch, dict)
logging.debug("Evaluating upstream patches:\n{}".format(patches))
for patch in patches:
assert isinstance(patch, dict)
image))
else:
logging.info("Ignoring patch:\n{}".format(patch))
image))
else:
logging.info("Ignoring patch:\n{}".format(patch))
virt_utils.virt_customize(virt_ops, image)
virt_utils.virt_customize(virt_ops, image)
patch_file = "{}.patch".format(change_id)
patch_file_path = "/dummytmp/{}".format(patch_file)
test_virt_ops = [
patch_file = "{}.patch".format(change_id)
patch_file_path = "/dummytmp/{}".format(patch_file)
test_virt_ops = [
+ {con.VIRT_INSTALL: 'patch'},
{con.VIRT_UPLOAD: "{}:{}".format(patch_file_path,
project_path)},
{con.VIRT_RUN_CMD: "cd {} && patch -p1 < {}".format(
{con.VIRT_UPLOAD: "{}:{}".format(patch_file_path,
project_path)},
{con.VIRT_RUN_CMD: "cd {} && patch -p1 < {}".format(
state: restarted
enabled: yes
become: yes
state: restarted
enabled: yes
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'
+ line: ' - OS::TripleO::Services::CephOSD'
+ owner: root
+ group: root
+ become: yes
- name: Upload glance images
shell: "{{ stackrc }} && openstack overcloud image upload"
become: yes
- name: Upload glance images
shell: "{{ stackrc }} && openstack overcloud image upload"
become: yes