From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 30 Oct 2017 15:51:44 +0000 (-0700)
Subject: Upgrade rhel_reg_sat_repo to 6.2
X-Git-Tag: opnfv-6.0.0~39^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b9a04a743e55bdf22004807c8a0e790f8de25c4a;p=apex-tripleo-heat-templates.git

Upgrade rhel_reg_sat_repo to 6.2

When deploying with RHSM, sat-tools 6.2 will be installed instead of 6.1.
The new version is supported by RHEL 7.4 and provides katello-agent package.

Change-Id: I04a9feab02bf606ad6ca923a17947dcca30258da
Closes-Bug: #1728638
(cherry picked from commit b248ae1447940f81513be9904a24197bd4af1126)
---

diff --git a/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml
index 24557517..a5eb35c6 100644
--- a/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml
+++ b/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml
@@ -20,7 +20,7 @@ parameter_defaults:
   rhel_reg_user: ""
   rhel_reg_type: ""
   rhel_reg_method: ""
-  rhel_reg_sat_repo: "rhel-7-server-satellite-tools-6.1-rpms"
+  rhel_reg_sat_repo: "rhel-7-server-satellite-tools-6.2-rpms"
   rhel_reg_http_proxy_host: ""
   rhel_reg_http_proxy_port: ""
   rhel_reg_http_proxy_username: ""
diff --git a/releasenotes/notes/sat-tools-0d0f0c53de9d34a5.yaml b/releasenotes/notes/sat-tools-0d0f0c53de9d34a5.yaml
new file mode 100644
index 00000000..eb3ab5fc
--- /dev/null
+++ b/releasenotes/notes/sat-tools-0d0f0c53de9d34a5.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    When deploying with RHSM, sat-tools 6.2 will be installed instead of 6.1.
+    The new version is supported by RHEL 7.4 and provides katello-agent package.