From: Feng Pan Date: Fri, 1 Dec 2017 00:24:14 +0000 (+0000) Subject: Merge "Fixes inserting ceph OSD into compute role" X-Git-Tag: opnfv-6.0.0~47 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5a6ac42f278fbe793375c03462d74f80c1527a5a;hp=7e37d85e8e935ca423526ee5327afe9558f9e25e;p=apex.git Merge "Fixes inserting ceph OSD into compute role" --- diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index 5d73dd49..013570d3 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -150,7 +150,8 @@ class Undercloud: if os.path.exists(dest_img): os.remove(dest_img) shutil.copyfile(src_img, dest_img) - + shutil.chown(dest_img, user='qemu', group='qemu') + os.chmod(dest_img, 0o0744) # TODO(trozet):check if resize needed right now size is 50gb # there is a lib called vminspect which has some dependencies and is # not yet available in pip. Consider switching to this lib later. @@ -192,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/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 7b7cac18..dde13a78 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -1,7 +1,7 @@ %global srcname opnfv-apex Name: python34-%{srcname} -Version: 5.0 +Version: 6.0 Release: %{_release} Summary: Scripts for OPNFV deployment using Apex @@ -116,6 +116,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Wed Nov 29 2017 Tim Rozet - 6.0-0 + Bump version for Fraser * Wed Oct 25 2017 Tim Rozet - 5.0-9 - Adds GitPython and pygerrit2 dependencies * Mon Oct 2 2017 Tim Rozet - 5.0-8 diff --git a/build/rpm_specs/opnfv-apex-onos.spec b/build/rpm_specs/opnfv-apex-onos.spec index 9a0ba571..2d600b98 100644 --- a/build/rpm_specs/opnfv-apex-onos.spec +++ b/build/rpm_specs/opnfv-apex-onos.spec @@ -1,5 +1,5 @@ Name: opnfv-apex-onos -Version: 5.0 +Version: 6.0 Release: %{_release} Summary: Overcloud Disk images for OPNFV Apex ONOS deployment @@ -30,6 +30,8 @@ install build/overcloud-full-onos.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ %{_var}/opt/opnfv/images/overcloud-full-onos.qcow2 %changelog +* Wed Nov 29 2017 Tim Rozet - 6.0-0 + Bump version for Fraser * Tue Apr 04 2017 Dan Radez - 5.0-1 - Version update for Euphrates * Wed Dec 7 2016 Tim Rozet - 4.0-2 diff --git a/build/rpm_specs/opnfv-apex-undercloud.spec b/build/rpm_specs/opnfv-apex-undercloud.spec index 339fff69..fc3c3ec1 100644 --- a/build/rpm_specs/opnfv-apex-undercloud.spec +++ b/build/rpm_specs/opnfv-apex-undercloud.spec @@ -1,5 +1,5 @@ Name: opnfv-apex-undercloud -Version: 5.0 +Version: 6.0 Release: %{_release} Summary: Scripts and Disk images to launch the Undercloud for OPNFV Apex @@ -37,6 +37,8 @@ install build/nics-template.yaml.jinja2 %{buildroot}%{_var}/opt/opnfv/ %changelog +* Wed Nov 29 2017 Tim Rozet - 6.0-0 + Bump version for Fraser * Tue Apr 04 2017 Dan Radez - 5.0-1 - Version update for Euphrates * Wed Nov 2 2016 Dan Radez - 4.0-1 diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index fdda3025..18fafa65 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -1,5 +1,5 @@ Name: opnfv-apex -Version: 5.0 +Version: 6.0 Release: %{_release} Summary: Overcloud Disk images for OPNFV Apex OpenDaylight deployment @@ -34,6 +34,8 @@ install build/overcloud-full.initrd %{buildroot}%{_var}/opt/opnfv/images/ %{_var}/opt/opnfv/images/overcloud-full.initrd %changelog +* Wed Nov 29 2017 Tim Rozet - 6.0-0 + Bump version for Fraser * Wed Aug 23 2017 Tim Rozet - 5.0-3 - Updated requirements * Fri May 26 2017 Tim Rozet - 5.0-2