openstack/tripleo-heat-templates
Code Issues Proposed changes

change the default satellite tools rpm repo.

Browse Source 
Change-Id: I60ab36b04b8932e4dbee58e21998dc984178b41c
Bugzilla:  https://bugzilla.redhat.com/1275281
This commit is contained in:
Mike Burns 2015-11-16 12:19:23 -05:00
parent dfa0b12265
commit d2566e5b94
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml
View File

@ -20,3 +20,4 @@ parameter_defaults:
rhel_reg_user: "" rhel_reg_user: ""
rhel_reg_type: "" rhel_reg_type: ""
rhel_reg_method: "" rhel_reg_method: ""
rhel_reg_sat_repo: "rhel-7-server-satellite-tools-6.1-rpms"

4
extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
View File

@ -43,6 +43,8 @@ parameters:
type: string type: string
rhel_reg_method: rhel_reg_method:
type: string type: string
rhel_reg_sat_repo:
type: string
resources: resources:
@ -68,6 +70,7 @@ resources:
- name: REG_USER - name: REG_USER
- name: REG_TYPE - name: REG_TYPE
- name: REG_METHOD - name: REG_METHOD
- name: REG_SAT_REPO
config: {get_file: scripts/rhel-registration} config: {get_file: scripts/rhel-registration}
RHELRegistrationDeployment: RHELRegistrationDeployment:
@ -95,6 +98,7 @@ resources:
REG_USER: {get_param: rhel_reg_user} REG_USER: {get_param: rhel_reg_user}
REG_TYPE: {get_param: rhel_reg_type} REG_TYPE: {get_param: rhel_reg_type}
REG_METHOD: {get_param: rhel_reg_method} REG_METHOD: {get_param: rhel_reg_method}
REG_SAT_REPO: {get_param: rhel_reg_sat_repo}
RHELUnregistration: RHELUnregistration:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig

2
extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
View File

@ -15,7 +15,7 @@ opts=
attach_opts= attach_opts=
sat5_opts= sat5_opts=
repos="repos --enable rhel-7-server-rpms" 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 if [ -n "${REG_AUTO_ATTACH:-}" ]; then
opts="$opts --auto-attach" opts="$opts --auto-attach"