From 91746c290be5fc374ad2389694779a7b57351c81 Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Wed, 10 Oct 2018 17:36:04 +0200 Subject: [PATCH] [Ocata/Pike/Queens] Make rhel-registration scripts location absolute. This patch modifies the script files location to be executed during the SoftwareDeployment resources in rhel-registration.yaml. The main purpose of this is to ensure we are running the right script content related to a branch, for example, after an upgrade. Change-Id: If77acb78c63511054e17d553982e19e748c88992 Related-Bug: #1797138 --- .../pre_deploy/rhel-registration/rhel-registration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml index 1e32618d8a..cfe474989e 100644 --- a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml +++ b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml @@ -110,7 +110,7 @@ resources: - name: REG_HTTP_PROXY_PORT - name: REG_HTTP_PROXY_USERNAME - name: REG_HTTP_PROXY_PASSWORD - config: {get_file: scripts/rhel-registration} + config: {get_file: /usr/share/openstack-tripleo-heat-templates/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration} RHELRegistrationDeployment: type: OS::Heat::SoftwareDeployment @@ -147,7 +147,7 @@ resources: type: OS::Heat::SoftwareConfig properties: group: script - config: {get_file: scripts/rhel-unregistration} + config: {get_file: /usr/share/openstack-tripleo-heat-templates/extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration} inputs: - name: REG_METHOD