aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-03 20:25:28 +0000
committerGerrit Code Review <review@openstack.org>2017-11-03 20:25:28 +0000
commit949c31fdd61059f18690ab85dc9078331e8d0574 (patch)
tree01a96f9960c334209039db4491af87d89f1a4fa6
parent5eaaf6ca5468bcdf6de3788d35303ddee565675b (diff)
parentb9a04a743e55bdf22004807c8a0e790f8de25c4a (diff)
Merge "Upgrade rhel_reg_sat_repo to 6.2" into stable/pike
-rw-r--r--extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml2
-rw-r--r--releasenotes/notes/sat-tools-0d0f0c53de9d34a5.yaml5
2 files changed, 6 insertions, 1 deletions
diff --git a/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml
index 2455751..a5eb35c 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 0000000..eb3ab5f
--- /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.