99a96ef416
Before:
(undercloud) [stack@undercloud-0 ~]$ openstack overcloud generate fencing --output fencetest.yaml instackenv.json
/usr/lib/python3.6/site-packages/osc_lib/shell.py:176: ResourceWarning: unclosed file <_io.TextIOWrapper name='fencetest.yaml' mode='w' encoding='UTF-8'>
ret_value = super(OpenStackShell, self).run_subcommand(argv)
/usr/lib/python3.6/site-packages/osc_lib/shell.py:176: ResourceWarning: unclosed file <_io.TextIOWrapper name='instackenv.json' mode='r' encoding='UTF-8'>
ret_value = super(OpenStackShell, self).run_subcommand(argv)
sys:1: ResourceWarning: unclosed <ssl.SSLSocket fd=4, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=6, laddr=('192.168.24.2', 56494), raddr=('192.168.24.2', 13000)>
sys:1: ResourceWarning: unclosed <ssl.SSLSocket fd=9, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=6, laddr=('192.168.24.2', 54102), raddr=('192.168.24.2', 13989)>
After:
(undercloud) [stack@undercloud-0 ~]$ openstack overcloud generate fencing --output fencetest.yaml instackenv.json
sys:1: ResourceWarning: unclosed <ssl.SSLSocket fd=4, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=6, laddr=('192.168.24.2', 47694), raddr=('192.168.24.2', 13000)>
sys:1: ResourceWarning: unclosed <ssl.SSLSocket fd=8, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=6, laddr=('192.168.24.2', 45306), raddr=('192.168.24.2', 13989)>
Note that we also explicitly close an opened FileType in tripleoclient/v1/overcloud_execute.py
as it was spotted while writing this review.
NB: The SSL warnings will be investigated separately
Change-Id: Ic8122ad1982deed0434d797a3fb0fba8512b27ab
Closes-Bug: #1845927
84 lines
3.1 KiB
Python
84 lines
3.1 KiB
Python
# Copyright 2016 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
import argparse
|
|
import logging
|
|
import os.path
|
|
import re
|
|
|
|
from tripleoclient import command
|
|
|
|
|
|
class RemoteExecute(command.Command):
|
|
"""Execute a Heat software config on the servers."""
|
|
|
|
log = logging.getLogger(__name__ + ".RemoteExecute")
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(RemoteExecute, self).get_parser(prog_name)
|
|
parser.add_argument('-s', '--server_name', dest='server_name',
|
|
help='Nova server_name or partial name to match.')
|
|
parser.add_argument('-g', '--group', dest='group',
|
|
default='script',
|
|
help='Heat Software config "group" type. '
|
|
'Defaults to "script".')
|
|
parser.add_argument('file_in', type=argparse.FileType('r'))
|
|
return parser
|
|
|
|
def take_action(self, parsed_args):
|
|
|
|
self.log.debug("take_action(%s)" % parsed_args)
|
|
config = parsed_args.file_in.read()
|
|
parsed_args.file_in.close()
|
|
workflow_client = self.app.client_manager.workflow_engine
|
|
tripleoclients = self.app.client_manager.tripleoclient
|
|
messaging_websocket = tripleoclients.messaging_websocket()
|
|
|
|
# no special characters here
|
|
config_name = re.sub('[^\w]*', '',
|
|
os.path.basename(parsed_args.file_in.name))
|
|
|
|
if not parsed_args.server_name:
|
|
raise Exception('Please specify the -s (--server_name) option.')
|
|
|
|
workflow_input = {
|
|
'server_name': parsed_args.server_name,
|
|
'config_name': config_name,
|
|
'group': parsed_args.group,
|
|
'config': config
|
|
}
|
|
|
|
workflow_client.executions.create(
|
|
'tripleo.deployment.v1.deploy_on_servers',
|
|
workflow_input=workflow_input
|
|
)
|
|
|
|
while True:
|
|
body = messaging_websocket.recv()['body']
|
|
if 'tripleo.deployment.v1.deploy_on_server' == body['type']:
|
|
payload = body['payload']
|
|
status = 'SUCCESS'
|
|
if payload['status_code'] != 0:
|
|
status = 'FAILED'
|
|
print('%s :: -- %s --' % (payload['server_name'], status))
|
|
if payload['stdout']:
|
|
print('stdout\n: %s\n' % payload['stdout'])
|
|
if payload['stderr']:
|
|
print('stderr\n: %s\n' % payload['stderr'])
|
|
if 'tripleo.deployment.v1.deploy_on_servers' == body['type']:
|
|
break
|
|
|
|
messaging_websocket.cleanup()
|