Merge "Unset DIB_YUM_REPO_CONF before running undercloud install" into stable/liberty

This commit is contained in:
Jenkins 2016-03-01 14:07:33 +00:00 committed by Gerrit Code Review
commit 3c178c8de9
2 changed files with 10 additions and 0 deletions

View File

@ -278,6 +278,12 @@ class TestGenerateEnvironment(BaseTestCase):
env = undercloud._generate_environment('.')
self.assertEqual('', env['UNDERCLOUD_SERVICE_CERTIFICATE'])
def test_remove_dib_yum_repo_conf(self):
self.useFixture(fixtures.EnvironmentVariable('DIB_YUM_REPO_CONF',
'rum_yepo.conf'))
env = undercloud._generate_environment('.')
self.assertNotIn(env, 'DIB_YUM_REPO_CONF')
class TestWritePasswordFile(BaseTestCase):
def test_normal(self):

View File

@ -645,6 +645,10 @@ def _generate_environment(instack_root):
if instack_env['UNDERCLOUD_SERVICE_CERTIFICATE']:
instack_env['UNDERCLOUD_SERVICE_CERTIFICATE'] = os.path.abspath(
instack_env['UNDERCLOUD_SERVICE_CERTIFICATE'])
# We're not in a chroot so this doesn't make sense, and it causes weird
# errors if it's set.
if instack_env.get('DIB_YUM_REPO_CONF'):
del instack_env['DIB_YUM_REPO_CONF']
_generate_endpoints(instack_env)