Enable foreman-maintain repo for satellite 6.4 installation

SatelliteQE · Jun 22, 2018 · 74b6a8e · 74b6a8e
1 parent c50717b
commit 74b6a8e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/automation_tools/__init__.py b/automation_tools/__init__.py
@@ -2300,6 +2300,18 @@ def product_install(distribution, create_vm=False, certificate_url=None,
         puppet4_repo = os.environ.get('PUPPET4_REPO')
         if puppet4_repo:
             execute(create_custom_repos, puppet4_repo=puppet4_repo, host=host)
+    # Sat6.4 and above: enable internal foreman-maintain repo for installation
+    if (
+            sat_version not in ['6.1', '6.2', '6.3']
+            and not distribution.endswith('cdn')
+    ):
+        maintain_repo = os.environ.get('MAINTAIN_REPO')
+        if maintain_repo:
+            execute(
+                create_custom_repos,
+                maintain_repo=maintain_repo,
+                host=host
+            )
     # execute returns a dictionary mapping host strings to the given task's
     # return value
     installer_options.update(execute(

diff --git a/automation_tools/repository.py b/automation_tools/repository.py
@@ -153,6 +153,7 @@ def enable_satellite_repos(cdn=False, beta=False, disable_enabled=True,
     ]
     if sat_version == '6.4':
         repos.append('rhel-{0}-server-ansible-2-rpms')
+        repos.append('rhel-7-server-satellite-maintenance-6-rpms')
     if beta:
         repos.append('rhel-server-{0}-satellite-6-beta-rpms')
     elif cdn: