From: Feng Pan <fpan@redhat.com>
Date: Thu, 30 Nov 2017 18:34:07 +0000 (+0000)
Subject: Merge "Disable introspection extras"
X-Git-Tag: opnfv-6.0.0~48
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f27da77b87837e025907f689890b413c8f183c59;hp=-c;p=apex.git

Merge "Disable introspection extras"
---

f27da77b87837e025907f689890b413c8f183c59
diff --combined apex/undercloud/undercloud.py
index 14be4401,abbe3ffe..013570d3
--- a/apex/undercloud/undercloud.py
+++ b/apex/undercloud/undercloud.py
@@@ -150,8 -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.
@@@ -193,6 -192,7 +193,7 @@@
              "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]),