Merge ~ltrager/maas:lp1800524 into maas:master

[Lee Trager]

LP: #1800524 - Configure yum to use the MAAS proxy when set on CentOS/RHEL.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1800524 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4374/console
COMMIT: 1f06f546cbdae3c9244ef1ba045bba8a9b3e15bc

review: Needs Fixing

[Andres Rodriguez (andreserl)]

See inline.

review: Needs Fixing

[Lee Trager (ltrager)]

Responded inline

[Lee Trager (ltrager)]

After discussing this with the team we agreed to put the late_command to configure yum to use a proxy during preseed generation. Users who wish to use a different proxy for yum or not set one at all will have to use their own late_command.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1800524 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4380/console
COMMIT: 1dbd3faef37670f931a66ec9be4859cb6e972a65

review: Needs Fixing

[Newell Jensen (newell-jensen)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1800524 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4381/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b lp1800524 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4382/consoleText

b71e4fd... by Lee Trager on 2018-11-05

Merge branch 'master' into lp1800524

ea1adc2... by Lee Trager on 2018-11-05

Fix lint

diff --git a/src/maasserver/forms/settings.py b/src/maasserver/forms/settings.py
index 0b91e06..d318759 100644
--- a/src/maasserver/forms/settings.py
+++ b/src/maasserver/forms/settings.py
@@ -282,12 +282,12 @@ CONFIG_ITEMS = {
         'default': True,
         'form': forms.BooleanField,
         'form_kwargs': {
-            'label': "Enable the use of an APT and HTTP/HTTPS proxy",
+            'label': "Enable the use of an APT or YUM and HTTP/HTTPS proxy",
             'required': False,
             'help_text': (
                 "Provision nodes to use the built-in HTTP proxy (or "
-                "user specified proxy) for APT. MAAS also uses the proxy for "
-                "downloading boot images.")
+                "user specified proxy) for APT or YUM. MAAS also uses the "
+                "proxy for downloading boot images.")
         }
     },
     'maas_proxy_port': {
@@ -329,11 +329,11 @@ CONFIG_ITEMS = {
         'default': None,
         'form': forms.URLField,
         'form_kwargs': {
-            'label': "Proxy for APT and HTTP/HTTPS",
+            'label': "Proxy for APT or YUM and HTTP/HTTPS",
             'required': False,
             'help_text': (
                 "This will be passed onto provisioned nodes to use as a "
-                "proxy for APT traffic. MAAS also uses the proxy for "
+                "proxy for APT or YUM traffic. MAAS also uses the proxy for "
                 "downloading boot images. If no URL is provided, the built-in "
                 "MAAS proxy will be used.")
         }
diff --git a/src/maasserver/preseed.py b/src/maasserver/preseed.py
index fd6b829..142be73 100644
--- a/src/maasserver/preseed.py
+++ b/src/maasserver/preseed.py
@@ -36,6 +36,7 @@ from maasserver.compose_preseed import (
     compose_debconf_cloud_init_preseed,
     compose_enlistment_preseed,
     compose_preseed,
+    get_apt_proxy,
     get_archive_config,
     get_cloud_init_reporting,
     RSYSLOG_PORT,
@@ -456,7 +457,7 @@ def get_curtin_config(request, node):
     deprecated_context_variables = [
         'main_archive_hostname', 'main_archive_directory',
         'ports_archive_hostname', 'ports_archive_directory',
-        'enable_http_proxy', 'http_proxy']
+        'enable_http_proxy']
     deprecated_config_variables = []
     for var in deprecated_context_variables:
         if var not in context:
@@ -497,6 +498,16 @@ def get_curtin_config(request, node):
     if 's390x' in node.architecture:
         command = {'maas_00': 'chreipl node /dev/' + node.get_boot_disk().name}
         config['late_commands'].update(command)
+    if node.osystem in ['centos', 'rhel'] and context['http_proxy']:
+        # The echo command must be one argument so direction works.
+        config['late_commands'].update({
+            'yum_proxy': [
+                'curtin', 'in-target', '--', 'bash', '-c',
+                'echo -e "\\n# Proxy configured by MAAS\\n'
+                'proxy=%s\\n" >> /etc/yum.conf' % context['http_proxy'],
+            ]
+        })
+
     return yaml.safe_dump(config)
 
 
@@ -755,6 +766,7 @@ def get_preseed_context(
     metadata_enlist_url = request.build_absolute_uri(reverse('enlist'))
     configs = Config.objects.get_configs(['remote_syslog', 'maas_syslog_port'])
     syslog = configs['remote_syslog']
+    http_proxy = get_apt_proxy(request, rack_controller)
     if not syslog:
         syslog_port = configs['maas_syslog_port']
         if not syslog_port:
@@ -767,6 +779,7 @@ def get_preseed_context(
         'server_url': server_url,
         'syslog_host_port': syslog,
         'metadata_enlist_url': metadata_enlist_url,
+        'http_proxy': http_proxy,
         }
 
 
@@ -819,7 +832,6 @@ def get_node_deprecated_preseed_context():
         'ports_archive_hostname': ports_archive_hostname,
         'ports_archive_directory': ports_archive_directory,
         'enable_http_proxy': Config.objects.get_config('enable_http_proxy'),
-        'http_proxy': Config.objects.get_config('http_proxy'),
     }
 
 
diff --git a/src/maasserver/static/partials/intro.html b/src/maasserver/static/partials/intro.html
index aecd112..7c1c201 100644
--- a/src/maasserver/static/partials/intro.html
+++ b/src/maasserver/static/partials/intro.html
@@ -49,7 +49,7 @@
                     <li>
                         <maas-obj-form obj="httpProxy" manager="configManager" class="p-form p-form--stacked">
                             <div class="p-form__group">
-                                <maas-obj-field type="text" key="value" label="APT &amp; HTTP/HTTPS proxy server" subtle="false" blur-on-enter="true" help-text="This will be passed onto deployed machines to use as a proxy for APT traffic. MAAS also uses the proxy for downloading boot images. If no URL is provided, the build-in MAAS proxy will be used."></maas-obj-field>
+                                <maas-obj-field type="text" key="value" label="APT &amp; HTTP/HTTPS proxy server" subtle="false" blur-on-enter="true" help-text="This will be passed onto deployed machines to use as a proxy for APT and YUM traffic. MAAS also uses the proxy for downloading boot images. If no URL is provided, the build-in MAAS proxy will be used."></maas-obj-field>
                             </div>
                         </maas-obj-form>
                     </li>
diff --git a/src/maasserver/static/partials/proxy-settings.html b/src/maasserver/static/partials/proxy-settings.html
index 20bbab9..070c293 100644
--- a/src/maasserver/static/partials/proxy-settings.html
+++ b/src/maasserver/static/partials/proxy-settings.html
@@ -1,5 +1,5 @@
 <li class="help-msg">
-  <label>HTTP proxy used by MAAS to download images, and by provisioned machines for APT packages.</label>
+  <label>HTTP proxy used by MAAS to download images, and by provisioned machines for APT and YUM packages.</label>
 </li>
 <li>
   <input type="radio" ng-model="proxy_type" name="maas_proxy"
diff --git a/src/maasserver/tests/test_preseed.py b/src/maasserver/tests/test_preseed.py
index fe8c571..cb4c2ae 100644
--- a/src/maasserver/tests/test_preseed.py
+++ b/src/maasserver/tests/test_preseed.py
@@ -461,7 +461,7 @@ class TestPreseedContext(MAASServerTestCase):
         context = get_preseed_context(make_HttpRequest())
         self.assertItemsEqual(
             ['osystem', 'release', 'metadata_enlist_url', 'server_host',
-             'server_url', 'syslog_host_port'],
+             'server_url', 'syslog_host_port', 'http_proxy'],
             context.keys())
 
     def test_get_preseed_context_includes_remote_syslog(self):
@@ -490,7 +490,7 @@ class TestNodeDeprecatedPreseedContext(
         self.assertItemsEqual(
             ['main_archive_hostname', 'main_archive_directory',
              'ports_archive_hostname', 'ports_archive_directory',
-             'enable_http_proxy', 'http_proxy'
+             'enable_http_proxy',
              ],
             context.keys())
 
@@ -1067,7 +1067,8 @@ class TestCurtinUtilities(
         node = factory.make_Node_with_Interface_on_Subnet(
             primary_rack=self.rpc_rack_controller)
         self.configure_get_boot_images_for_node(node, 'xinstall')
-        config = get_curtin_config(make_HttpRequest(), node)
+        request = make_HttpRequest()
+        config = get_curtin_config(request, node)
         self.assertThat(
             config,
             Contains("debconf_selections:"))
@@ -1157,6 +1158,14 @@ class TestCurtinUtilities(
             Contains(
                 'maas_00: chreipl node /dev/' + node.get_boot_disk().name))
 
+    def test_get_curtin_config_has_yum_proxy_late_command(self):
+        node = factory.make_Node_with_Interface_on_Subnet(
+            primary_rack=self.rpc_rack_controller,
+            osystem=random.choice(['centos', 'rhel']))
+        self.configure_get_boot_images_for_node(node, 'xinstall')
+        config = get_curtin_config(make_HttpRequest(), node)
+        self.assertThat(config, Contains('proxy='))
+
     def make_fastpath_node(self, main_arch=None):
         """Return a `Node`, with FPI enabled, and the given main architecture.