openstack
/
python-tripleoclient
Code Issues Proposed changes

Stop supporting the removed pxe_ssh driver in `generate fencing parameters` 

This driver was removed back in Pike. Since the os_auth argument to the workflow
was only used with it, this argument is no longer provided.

Change-Id: Iabeff718a0e81bef00d3993cd2e142c4a667847e
Related-Bug: #1770700
Depends-On: https://review.openstack.org/567896
This commit is contained in:
Dmitry Tantsur 2018-05-24 10:18:36 +02:00
parent 597318e2ee
commit 3ab85fed34
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleoclient/tests/v1/test_overcloud_parameters.py
View File

@ -126,11 +126,6 @@ class TestGenerateFencingParameters(utils.TestCommand):
}
""")
os.environ["OS_USERNAME"] = "test_os_username"
os.environ["OS_PASSWORD"] = "test_os_password"
os.environ["OS_AUTH_URL"] = "test://auth.url"
os.environ["OS_TENANT_NAME"] = "test_os_tenant_name"
arglist = ['node_file.json']
verifylist = []
@ -162,7 +157,6 @@ class TestGenerateFencingParameters(utils.TestCommand):
u'mac': [u'11:22:33:44:55:66']
}],
'delay': None,
'os_auth': None,
'ipmi_cipher': None,
'ipmi_lanplus': False,
'ipmi_level': None

23
tripleoclient/v1/overcloud_parameters.py
View File

@ -12,7 +12,6 @@
import argparse
import logging
import os
import simplejson
import yaml
@ -96,30 +95,8 @@ class GenerateFencingParameters(command.Command):
def take_action(self, parsed_args):
nodes_config = utils.parse_env_file(parsed_args.instackenv)
# We only need to collect OpenStack client authentication data
# if we have nodes using Ironic's pxe_ssh driver. If there are
# any, we'll use the fence_ironic fencing agent, which requires
# the auth data.
os_auth = None
for node in nodes_config:
if node["pm_type"] == "pxe_ssh":
os_auth = {}
if os_auth:
try:
os_auth["auth_url"] = os.environ["OS_AUTH_URL"]
os_auth["login"] = os.environ["OS_USERNAME"]
os_auth["passwd"] = os.environ["OS_PASSWORD"]
os_auth["tenant_name"] = os.environ["OS_TENANT_NAME"]
except KeyError:
# This really shouldn't happen since we're running in
# tripleoclient
raise ValueError(
_("Unable to find one or more of OS_AUTH_URL, "
"OS_USERNAME, OS_PASSWORD or OS_TENANT_NAME in the "
"environment."))
workflow_input = {
'nodes_json': nodes_config,
'os_auth': os_auth,
'delay': parsed_args.delay,
'ipmi_level': parsed_args.ipmi_level,
'ipmi_cipher': parsed_args.ipmi_cipher,