openstack
/
instack-undercloud
Code Issues Proposed changes

Fail-fast if the undercloud-passwords.conf file is missing 

On undercloud updates/upgrades, if the undercloud-passwords.conf
file was deleted or moved it will break some services because there
are passwords that cannot be changed.  This validates that the file
exists and stops immediately with a message explaining the problem
if the file is missing.

Change-Id: Ic83d6afc8dc2128874b97cc414ea28272e7d6639
Closes-Bug: 1702709
(cherry picked from commit 74123de347)
(cherry picked from commit b86f03e3b5)
This commit is contained in:
Ben Nemec 2017-07-06 15:49:08 +00:00
parent b63d38ce3f
commit e9a5137e7e
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
instack_undercloud/tests/test_undercloud.py
View File

@ -28,6 +28,7 @@ from oslotest import mockpatch
from six.moves import configparser
from instack_undercloud import undercloud
from instack_undercloud import validator
undercloud._configure_logging(undercloud.DEFAULT_LOG_LEVEL, None)
@ -81,10 +82,13 @@ class TestUndercloud(BaseTestCase):
@mock.patch('instack_undercloud.undercloud._check_memory')
@mock.patch('instack_undercloud.undercloud._check_sysctl')
@mock.patch('instack_undercloud.undercloud._validate_network')
def test_validate_configuration(self, mock_validate_network,
@mock.patch('instack_undercloud.undercloud._validate_passwords_file')
def test_validate_configuration(self, mock_vpf,
mock_validate_network,
mock_check_memory, mock_check_hostname,
mock_check_sysctl):
undercloud._validate_configuration()
self.assertTrue(mock_vpf.called)
self.assertTrue(mock_validate_network.called)
self.assertTrue(mock_check_memory.called)
self.assertTrue(mock_check_hostname.called)
@ -199,6 +203,22 @@ class TestCheckSysctl(BaseTestCase):
undercloud._check_sysctl()
@mock.patch('os.path.isfile')
class TestPasswordsFileExists(BaseTestCase):
def test_new_install(self, mock_isfile):
mock_isfile.side_effect = [False]
undercloud._validate_passwords_file()
def test_update_exists(self, mock_isfile):
mock_isfile.side_effect = [True, True]
undercloud._validate_passwords_file()
def test_update_missing(self, mock_isfile):
mock_isfile.side_effect = [True, False]
self.assertRaises(validator.FailedValidation,
undercloud._validate_passwords_file)
class TestGenerateEnvironment(BaseTestCase):
def setUp(self):
super(TestGenerateEnvironment, self).setUp()

17
instack_undercloud/undercloud.py
View File

@ -630,12 +630,29 @@ def _validate_cidr():
CONF.set_override('network_cidr', '192.0.2.0/24')
def _validate_passwords_file():
"""Disallow updates if the passwords file is missing
If the undercloud was already deployed, the passwords file needs to be
present so passwords that can't be changed are persisted. If the file
is missing it will break the undercloud, so we should fail-fast and let
the user know about the problem.
"""
if (os.path.isfile(os.path.expanduser('~/stackrc')) and
not os.path.isfile(PATHS.PASSWORD_PATH)):
message = ('The %s file is missing. This will cause all service '
'passwords to change and break the existing undercloud. ' %
PATHS.PASSWORD_PATH)
raise validator.FailedValidation(message)
def _validate_configuration():
try:
_check_hostname()
_check_memory()
_check_sysctl()
_validate_network()
_validate_passwords_file()
except RuntimeError as e:
LOG.error('ERROR: An error occured during configuration validation, '
'please check your host configuration and try again. '