diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-02-28 07:36:56 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-02-28 07:36:56 +0000 |
commit | ef0ce3e86af585621d02abda8d1a88101c5c82c9 (patch) | |
tree | a5c958f6fa1e0394033b8a3f31eafd5c374df05a /extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml | |
parent | cfdd5f30029b4c155e5086f322d3b9f10d912ebb (diff) | |
parent | 3002edc90a631f3adb8ae0ee696062347f94ea52 (diff) |
Merge "Adds http proxy support for registering RHEL overcloud nodes"
Diffstat (limited to 'extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml')
-rw-r--r-- | extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml index fdf2e957..e8316c53 100644 --- a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml +++ b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml @@ -45,6 +45,14 @@ parameters: type: string rhel_reg_sat_repo: type: string + rhel_reg_http_proxy_host: + type: string + rhel_reg_http_proxy_port: + type: string + rhel_reg_http_proxy_username: + type: string + rhel_reg_http_proxy_password: + type: string resources: @@ -71,6 +79,10 @@ resources: - name: REG_TYPE - name: REG_METHOD - name: REG_SAT_REPO + - name: REG_HTTP_PROXY_HOST + - name: REG_HTTP_PROXY_PORT + - name: REG_HTTP_PROXY_USERNAME + - name: REG_HTTP_PROXY_PASSWORD config: {get_file: scripts/rhel-registration} RHELRegistrationDeployment: @@ -99,6 +111,10 @@ resources: REG_TYPE: {get_param: rhel_reg_type} REG_METHOD: {get_param: rhel_reg_method} REG_SAT_REPO: {get_param: rhel_reg_sat_repo} + REG_HTTP_PROXY_HOST: {get_param: rhel_reg_http_proxy_host} + REG_HTTP_PROXY_PORT: {get_param: rhel_reg_http_proxy_port} + REG_HTTP_PROXY_USERNAME: {get_param: rhel_reg_http_proxy_username} + REG_HTTP_PROXY_PASSWORD: {get_param: rhel_reg_http_proxy_password} RHELUnregistration: type: OS::Heat::SoftwareConfig |