From fdb2debc3b80ee8c8ad0dd94986e3fca342a55d7 Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Fri, 8 Mar 2019 17:17:01 -0600 Subject: [PATCH] Fix openstacklib to use openrc from platform The old patch was using /etc/nova/openrc The modified patch is /etc/platform/openrc Since all the nova files are disappearing from the controller, this needs to be updated in order to setup keystone. Change-Id: Ie43cf11ebf1edcf3a8bb357205c4c59d2962b4fa Story: 2004764 Task: 29931 Signed-off-by: Al Bailey --- .../puppet-openstacklib-11.3.0/centos/build_srpm.data | 2 +- .../centos/patches/0001-Roll-up-TIS-patches.patch | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data index 0eac83bbb..024e3e138 100644 --- a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data +++ b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=4 +TIS_PATCH_VER=5 diff --git a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch index 5030d2a2b..9f0328c40 100644 --- a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch +++ b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch @@ -1,9 +1,8 @@ -From d73f9ea44ec91944af0bc4faa743b0df2570f200 Mon Sep 17 00:00:00 2001 +From be4aad7589bc63f90b98b7d5692701a8368f8b04 Mon Sep 17 00:00:00 2001 From: Al Bailey -Date: Mon, 16 Oct 2017 13:12:14 -0500 -Subject: [PATCH] Roll up TIS patches +Date: Mon, 11 Mar 2019 07:55:54 -0500 +Subject: [PATCH 1/3] Roll up TIS patches -Includes CGTS-6741 puppet openstack use internal url --- lib/puppet/provider/openstack.rb | 1 + lib/puppet/provider/openstack/auth.rb | 16 ++++++++++++++-- @@ -23,7 +22,7 @@ index 0240ce4..8b8e564 100644 end rescue Timeout::Error diff --git a/lib/puppet/provider/openstack/auth.rb b/lib/puppet/provider/openstack/auth.rb -index 743071d..73abeb3 100644 +index 743071d..4026aec 100644 --- a/lib/puppet/provider/openstack/auth.rb +++ b/lib/puppet/provider/openstack/auth.rb @@ -1,9 +1,19 @@ @@ -34,7 +33,7 @@ index 743071d..73abeb3 100644 module Puppet::Provider::Openstack::Auth - RCFILENAME = "#{ENV['HOME']}/openrc" -+ RCFILENAME = "/etc/nova/openrc" ++ RCFILENAME = "/etc/platform/openrc" + + def lookup_hiera(key) + HieraPuppet.lookup(key, :undef, self, nil, :priority)