|
|
|
@ -102,8 +102,7 @@ class Deploy(command.Command):
|
|
|
|
|
def _is_undercloud_deploy(self, parsed_args):
|
|
|
|
|
role = parsed_args.standalone_role
|
|
|
|
|
stack = parsed_args.stack
|
|
|
|
|
return (role in ['Undercloud', 'UndercloudMinion'] and
|
|
|
|
|
stack in ['undercloud', 'minion'])
|
|
|
|
|
return (role in ['Undercloud'] and stack in ['undercloud'])
|
|
|
|
|
|
|
|
|
|
def _run_preflight_checks(self, parsed_args):
|
|
|
|
|
"""Run preflight deployment checks
|
|
|
|
@ -557,8 +556,7 @@ class Deploy(command.Command):
|
|
|
|
|
def _load_user_params(self, user_environments):
|
|
|
|
|
user_params = {}
|
|
|
|
|
for env_file in user_environments:
|
|
|
|
|
# undercloud and minion heat stack virtual state tracking is not
|
|
|
|
|
# available yet
|
|
|
|
|
# undercloud heat stack virtual state tracking is not available yet
|
|
|
|
|
if env_file.endswith('-stack-vstate-dropin.yaml'):
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
@ -860,20 +858,6 @@ class Deploy(command.Command):
|
|
|
|
|
if 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())
|
|
|
|
|
output = {'parameter_defaults': outputs}
|
|
|
|
|
with open(endpointmap_file, 'w') as f:
|
|
|
|
|