Merge "Fixes stale undercloud delorean repos"

diff --cc apex/deploy.py
Simple merge

diff --cc apex/undercloud/undercloud.py
index 63f9183,4490ed2..a70c465
--- 1/apex/undercloud/undercloud.py
--- 2/apex/undercloud/undercloud.py
+++ b/apex/undercloud/undercloud.py
@@@ -236,7 -239,19 +239,22 @@@ class Undercloud
              "enabled": ns_external['enabled']
          }
  
 +        config['http_proxy'] = ns.get('http_proxy', '')
 +        config['https_proxy'] = ns.get('https_proxy', '')
 +
          return config
+ 
+     def _update_delorean_repo(self):
+         if utils.internet_connectivity():
+             logging.info('Updating delorean repo on Undercloud')
+             delorean_repo = (
+                 "https://trunk.rdoproject.org/centos7-{}"
+                 "/current-tripleo/delorean.repo".format(self.os_version))
+             cmd = ("curl -L -f -o "
+                    "/etc/yum.repos.d/deloran.repo {}".format(delorean_repo))
+             try:
+                 virt_utils.virt_customize({constants.VIRT_RUN_CMD: cmd},
+                                           self.volume)
+             except Exception:
+                 logging.warning("Failed to download and update delorean repo "
+                                 "for Undercloud")