From d2566e5b947b60e584d41a9b3445fb771179f819 Mon Sep 17 00:00:00 2001
From: Mike Burns <mburns@redhat.com>
Date: Mon, 16 Nov 2015 12:19:23 -0500
Subject: change the default satellite tools rpm repo.

Change-Id: I60ab36b04b8932e4dbee58e21998dc984178b41c
Bugzilla:  https://bugzilla.redhat.com/1275281
---
 .../pre_deploy/rhel-registration/environment-rhel-registration.yaml   | 1 +
 extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml       | 4 ++++
 extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration    | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'extraconfig')

diff --git a/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml
index 70437a8a..c388358a 100644
--- a/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml
+++ b/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml
@@ -20,3 +20,4 @@ parameter_defaults:
   rhel_reg_user: ""
   rhel_reg_type: ""
   rhel_reg_method: ""
+  rhel_reg_sat_repo: "rhel-7-server-satellite-tools-6.1-rpms"
diff --git a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
index a884bdae..7c65bd8b 100644
--- a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
+++ b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
@@ -43,6 +43,8 @@ parameters:
     type: string
   rhel_reg_method:
     type: string
+  rhel_reg_sat_repo:
+    type: string
 
 resources:
 
@@ -68,6 +70,7 @@ resources:
         - name: REG_USER
         - name: REG_TYPE
         - name: REG_METHOD
+        - name: REG_SAT_REPO
       config: {get_file: scripts/rhel-registration}
 
   RHELRegistrationDeployment:
@@ -95,6 +98,7 @@ resources:
         REG_USER: {get_param: rhel_reg_user}
         REG_TYPE: {get_param: rhel_reg_type}
         REG_METHOD: {get_param: rhel_reg_method}
+        REG_SAT_REPO: {get_param: rhel_reg_sat_repo}
 
   RHELUnregistration:
     type: OS::Heat::SoftwareConfig
diff --git a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
index 242819b0..1c9acd2b 100644
--- a/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
+++ b/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
@@ -15,7 +15,7 @@ opts=
 attach_opts=
 sat5_opts=
 repos="repos --enable rhel-7-server-rpms"
-satellite_repo="rhel-7-server-rh-common-rpms"
+satellite_repo=${REG_SAT_REPO}
 if [ -n "${REG_AUTO_ATTACH:-}" ]; then
     opts="$opts --auto-attach"
 
-- 
cgit 1.2.3-korg