Try connecting to undercloud-0 host to verify it exists
Change-Id: I925cca50569cbae4ed6caae21838a85f2c13c093
This commit is contained in:
parent
cd76eac859
commit
94d6543781
@ -21,7 +21,7 @@ GROUP_NAME = 'tripleo'
|
|||||||
OPTIONS = [
|
OPTIONS = [
|
||||||
# Undercloud options
|
# Undercloud options
|
||||||
cfg.StrOpt('undercloud_ssh_hostname',
|
cfg.StrOpt('undercloud_ssh_hostname',
|
||||||
default=None,
|
default='undercloud-0',
|
||||||
help="hostname or IP address to be used to connect to "
|
help="hostname or IP address to be used to connect to "
|
||||||
"undercloud host"),
|
"undercloud host"),
|
||||||
cfg.IntOpt('undercloud_ssh_port',
|
cfg.IntOpt('undercloud_ssh_port',
|
||||||
|
@ -13,6 +13,8 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
|
from oslo_log import log
|
||||||
|
|
||||||
import tobiko
|
import tobiko
|
||||||
from tobiko import config
|
from tobiko import config
|
||||||
from tobiko.openstack import keystone
|
from tobiko.openstack import keystone
|
||||||
@ -21,6 +23,8 @@ from tobiko.shell import sh
|
|||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
|
||||||
|
LOG = log.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
def undercloud_ssh_client():
|
def undercloud_ssh_client():
|
||||||
host_config = undercloud_host_config()
|
host_config = undercloud_host_config()
|
||||||
@ -51,9 +55,23 @@ class UndercloudKeystoneCredentialsFixture(
|
|||||||
return load_undercloud_rcfile()
|
return load_undercloud_rcfile()
|
||||||
|
|
||||||
|
|
||||||
|
class HasUndercloudFixture(tobiko.SharedFixture):
|
||||||
|
|
||||||
|
has_undercloud = None
|
||||||
|
|
||||||
|
def setup_fixture(self):
|
||||||
|
ssh_client = undercloud_ssh_client()
|
||||||
|
try:
|
||||||
|
ssh_client.connect()
|
||||||
|
except Exception as ex:
|
||||||
|
LOG.debug('Unable to connect to undercloud host: %s', ex)
|
||||||
|
self.has_undercloud = False
|
||||||
|
else:
|
||||||
|
self.has_undercloud = True
|
||||||
|
|
||||||
|
|
||||||
def has_undercloud():
|
def has_undercloud():
|
||||||
host_config = undercloud_host_config()
|
return tobiko.setup_fixture(HasUndercloudFixture).has_undercloud
|
||||||
return bool(host_config.hostname)
|
|
||||||
|
|
||||||
|
|
||||||
skip_if_missing_undercloud = tobiko.skip_unless(
|
skip_if_missing_undercloud = tobiko.skip_unless(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user