Merge "Switch deployed-server if nova unavailable" into stable/victoria

This commit is contained in:
Zuul 2020-11-09 22:21:35 +00:00 committed by Gerrit Code Review
commit 191b80c7de
1 changed files with 8 additions and 2 deletions

View File

@ -30,6 +30,7 @@ import time
import yaml
from heatclient.common import template_utils
from keystoneauth1.exceptions.catalog import EndpointNotFound
import openstack
from osc_lib import exceptions as oscexc
from osc_lib.i18n import _
@ -64,8 +65,13 @@ class DeployOvercloud(command.Command):
self.object_client = self.clients.tripleoclient.object_store
self.orchestration_client = self.clients.orchestration
if not parsed_args.deployed_server:
self.compute_client = self.clients.compute
self.baremetal_client = self.clients.baremetal
try:
self.compute_client = self.clients.compute
self.baremetal_client = self.clients.baremetal
except EndpointNotFound:
self.log.warning('WARNING: Nova endpoint not available. '
'Assuming --deployed-server')
parsed_args.deployed_server = True
def _update_parameters(self, args, stack):
parameters = {}