Don't run get_config() in update/upgrade prepare
This is done again in update/upgrade run. It seems redundant to do it in prepare step. Change-Id: I94350324d32af477bbbb69314a93d22668bfad4d
This commit is contained in:
parent
a20dc2d849
commit
eb6c831f5f
|
@ -61,8 +61,6 @@ from heatclient import exc as hc_exc
|
|||
from six.moves.urllib import error as url_error
|
||||
from six.moves.urllib import request
|
||||
|
||||
from tripleo_common.actions import config
|
||||
|
||||
from tripleoclient import constants
|
||||
from tripleoclient import exceptions
|
||||
|
||||
|
@ -1476,22 +1474,6 @@ def load_environment_directories(directories):
|
|||
return environments
|
||||
|
||||
|
||||
def get_config(clients, container, container_config):
|
||||
"""Get cloud config.
|
||||
|
||||
:param clients: Application client object.
|
||||
:type clients: Object
|
||||
|
||||
:param container: Container name to pull from.
|
||||
:type container: String.
|
||||
"""
|
||||
|
||||
context = clients.tripleoclient.create_mistral_context()
|
||||
config_action = config.GetOvercloudConfig(
|
||||
container=container, container_config=container_config)
|
||||
config_action.run(context=context)
|
||||
|
||||
|
||||
def get_key(stack, needs_pair=False):
|
||||
"""Returns the private key from the local file system.
|
||||
|
||||
|
|
|
@ -77,10 +77,6 @@ class FFWDUpgradePrepare(DeployOvercloud):
|
|||
|
||||
super(FFWDUpgradePrepare, self).take_action(parsed_args)
|
||||
package_update.update(clients, container=stack_name)
|
||||
oooutils.get_config(
|
||||
clients, container=stack_name,
|
||||
container_config='{}-config'.format(stack.stack_name))
|
||||
|
||||
deployment.create_overcloudrc(container=stack_name)
|
||||
|
||||
# refresh stack info and enable ssh admin for Ansible-via-Mistral
|
||||
|
|
|
@ -74,9 +74,6 @@ class UpdatePrepare(DeployOvercloud):
|
|||
|
||||
super(UpdatePrepare, self).take_action(parsed_args)
|
||||
package_update.update(clients, container=stack_name)
|
||||
oooutils.get_config(
|
||||
clients, container=stack_name,
|
||||
container_config='{}-config'.format(stack.stack_name))
|
||||
self.log.info("Update init on stack {0} complete.".format(
|
||||
parsed_args.stack))
|
||||
|
||||
|
|
|
@ -73,9 +73,6 @@ class UpgradePrepare(DeployOvercloud):
|
|||
constants.UPGRADE_PREPARE_ENV)
|
||||
super(UpgradePrepare, self).take_action(parsed_args)
|
||||
package_update.update(clients, container=stack_name)
|
||||
oooutils.get_config(
|
||||
clients, container=stack_name,
|
||||
container_config='{}-config'.format(stack.stack_name))
|
||||
|
||||
deployment.create_overcloudrc(container=stack_name)
|
||||
|
||||
|
|
Loading…
Reference in New Issue