Remove leftover of minion
This change removes leftover of Minion, which was already removed[1]. [1] 4dbb45315bde23da4c3de5b8b8af4c0087a8aa2c Change-Id: I072ff03db33352030466ac305de8b35abc6f3b8c
This commit is contained in:
parent
71b89f4387
commit
7f7f423a7a
1
.gitignore
vendored
1
.gitignore
vendored
@ -34,7 +34,6 @@ lib64
|
|||||||
# Installer logs
|
# Installer logs
|
||||||
pip-log.txt
|
pip-log.txt
|
||||||
install-undercloud.log
|
install-undercloud.log
|
||||||
install-minion.log
|
|
||||||
|
|
||||||
# Unit test / coverage reports
|
# Unit test / coverage reports
|
||||||
.coverage
|
.coverage
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
[DEFAULT]
|
|
||||||
output_file = minion.conf.sample
|
|
||||||
namespace = minion_config
|
|
@ -24,10 +24,6 @@ TRIPLEO_ARCHIVE_DIR = "/var/lib/tripleo/archive"
|
|||||||
TRIPLEO_HEAT_TEMPLATES = "/usr/share/openstack-tripleo-heat-templates/"
|
TRIPLEO_HEAT_TEMPLATES = "/usr/share/openstack-tripleo-heat-templates/"
|
||||||
OVERCLOUD_YAML_NAME = "overcloud.yaml"
|
OVERCLOUD_YAML_NAME = "overcloud.yaml"
|
||||||
OVERCLOUD_ROLES_FILE = "roles_data.yaml"
|
OVERCLOUD_ROLES_FILE = "roles_data.yaml"
|
||||||
MINION_ROLES_FILE = "roles/UndercloudMinion.yaml"
|
|
||||||
MINION_OUTPUT_DIR = os.path.join(os.environ.get('HOME', '~/'))
|
|
||||||
MINION_CONF_PATH = os.path.join(MINION_OUTPUT_DIR, "minion.conf")
|
|
||||||
MINION_LOG_FILE = "install-minion.log"
|
|
||||||
UNDERCLOUD_ROLES_FILE = "roles_data_undercloud.yaml"
|
UNDERCLOUD_ROLES_FILE = "roles_data_undercloud.yaml"
|
||||||
STANDALONE_EPHEMERAL_STACK_VSTATE = '/var/lib/tripleo-heat-installer'
|
STANDALONE_EPHEMERAL_STACK_VSTATE = '/var/lib/tripleo-heat-installer'
|
||||||
UNDERCLOUD_LOG_FILE = "install-undercloud.log"
|
UNDERCLOUD_LOG_FILE = "install-undercloud.log"
|
||||||
|
@ -2643,7 +2643,7 @@ def copy_clouds_yaml(user):
|
|||||||
clouds_user_id = os.stat(clouds_home_dir).st_uid
|
clouds_user_id = os.stat(clouds_home_dir).st_uid
|
||||||
clouds_group_id = os.stat(clouds_home_dir).st_gid
|
clouds_group_id = os.stat(clouds_home_dir).st_gid
|
||||||
|
|
||||||
# If the file doesn't exist (e.g. on a minion node), we don't need to copy
|
# If the file doesn't exist, we don't need to copy
|
||||||
# /etc/openstack/clouds.yaml to the user directory.
|
# /etc/openstack/clouds.yaml to the user directory.
|
||||||
if not os.path.isfile(clouds_etc_file):
|
if not os.path.isfile(clouds_etc_file):
|
||||||
return
|
return
|
||||||
|
@ -102,8 +102,7 @@ class Deploy(command.Command):
|
|||||||
def _is_undercloud_deploy(self, parsed_args):
|
def _is_undercloud_deploy(self, parsed_args):
|
||||||
role = parsed_args.standalone_role
|
role = parsed_args.standalone_role
|
||||||
stack = parsed_args.stack
|
stack = parsed_args.stack
|
||||||
return (role in ['Undercloud', 'UndercloudMinion'] and
|
return (role in ['Undercloud'] and stack in ['undercloud'])
|
||||||
stack in ['undercloud', 'minion'])
|
|
||||||
|
|
||||||
def _run_preflight_checks(self, parsed_args):
|
def _run_preflight_checks(self, parsed_args):
|
||||||
"""Run preflight deployment checks
|
"""Run preflight deployment checks
|
||||||
@ -557,8 +556,7 @@ class Deploy(command.Command):
|
|||||||
def _load_user_params(self, user_environments):
|
def _load_user_params(self, user_environments):
|
||||||
user_params = {}
|
user_params = {}
|
||||||
for env_file in user_environments:
|
for env_file in user_environments:
|
||||||
# undercloud and minion heat stack virtual state tracking is not
|
# undercloud heat stack virtual state tracking is not available yet
|
||||||
# available yet
|
|
||||||
if env_file.endswith('-stack-vstate-dropin.yaml'):
|
if env_file.endswith('-stack-vstate-dropin.yaml'):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@ -860,20 +858,6 @@ class Deploy(command.Command):
|
|||||||
if hosts:
|
if hosts:
|
||||||
outputs['ExtraHostFileEntries'] = hosts
|
outputs['ExtraHostFileEntries'] = hosts
|
||||||
|
|
||||||
globalcfg = utils.get_stack_output_item(stack, 'GlobalConfig')
|
|
||||||
if globalcfg:
|
|
||||||
# unfortunately oslo messaging doesn't use the standard endpoint
|
|
||||||
# configurations so we need to build out the node name vars and
|
|
||||||
# we want to grab it for the undercloud for use by a minion.
|
|
||||||
# The same is true for memcached as well.
|
|
||||||
rolenet = utils.get_stack_output_item(stack, 'RoleNetIpMap')
|
|
||||||
if 'Undercloud' in rolenet:
|
|
||||||
name = rolenet['Undercloud']['ctlplane']
|
|
||||||
globalcfg['oslo_messaging_rpc_node_names'] = [name]
|
|
||||||
globalcfg['oslo_messaging_notify_node_names'] = [name]
|
|
||||||
globalcfg['memcached_node_ips'] = [name]
|
|
||||||
outputs['GlobalConfigExtraMapData'] = globalcfg
|
|
||||||
|
|
||||||
self._create_working_dirs(stack_name.lower())
|
self._create_working_dirs(stack_name.lower())
|
||||||
output = {'parameter_defaults': outputs}
|
output = {'parameter_defaults': outputs}
|
||||||
with open(endpointmap_file, 'w') as f:
|
with open(endpointmap_file, 'w') as f:
|
||||||
|
@ -558,38 +558,3 @@ def check(verbose_level, upgrade=False, net_config_yaml=None):
|
|||||||
'configuration and try again. Error '
|
'configuration and try again. Error '
|
||||||
'message: {error}').format(error=e))
|
'message: {error}').format(error=e))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
def minion_check(verbose_level, upgrade=False):
|
|
||||||
utils.load_config(CONF, constants.MINION_CONF_PATH)
|
|
||||||
utils.configure_logging(LOG, verbose_level, CONF['minion_log_file'])
|
|
||||||
|
|
||||||
try:
|
|
||||||
_checking_status('Hostname')
|
|
||||||
utils.check_hostname()
|
|
||||||
_checking_status('Sysctl')
|
|
||||||
_check_sysctl()
|
|
||||||
_checking_status('Network interfaces')
|
|
||||||
_validate_interface_exists('minion_local_interface')
|
|
||||||
_checking_status('Password file')
|
|
||||||
_validate_passwords_file()
|
|
||||||
# Heat templates validations
|
|
||||||
if CONF.get('custom_env_files'):
|
|
||||||
_checking_status('Custom env file')
|
|
||||||
_validate_env_files_paths()
|
|
||||||
except KeyError as e:
|
|
||||||
LOG.error(_('Key error in configuration: {error}\n'
|
|
||||||
'Value is missing in configuration.').format(error=e))
|
|
||||||
sys.exit(1)
|
|
||||||
except FailedValidation as e:
|
|
||||||
LOG.error(_('An error occurred during configuration '
|
|
||||||
'validation, please check your host '
|
|
||||||
'configuration and try again.\nError '
|
|
||||||
'message: {error}').format(error=e))
|
|
||||||
sys.exit(1)
|
|
||||||
except RuntimeError as e:
|
|
||||||
LOG.error(_('An error occurred during configuration '
|
|
||||||
'validation, please check your host '
|
|
||||||
'configuration and try again. Error '
|
|
||||||
'message: {error}').format(error=e))
|
|
||||||
sys.exit(1)
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user