From 91e01482c6c2eb772cd8c4c7bb9ec470dad3ca29 Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Sun, 1 Nov 2015 09:26:25 -0500 Subject: [PATCH] Move ironic client attribute to correct class The _ironic_client attribute is useful only for the OperatorCloud class, so having it defined in OpenStackCloud is bad programming style. Move it to where it is used. Change-Id: I8141e1758e28a8120f0e78c9e407bb416a499166 --- shade/openstackcloud.py | 1 - shade/operatorcloud.py | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py index 16e2baf99..420817431 100644 --- a/shade/openstackcloud.py +++ b/shade/openstackcloud.py @@ -216,7 +216,6 @@ class OpenStackCloud(object): self._glance_client = None self._glance_endpoint = None self._heat_client = None - self._ironic_client = None self._keystone_client = None self._neutron_client = None self._nova_client = None diff --git a/shade/operatorcloud.py b/shade/operatorcloud.py index ca2099bc2..16c0baae8 100644 --- a/shade/operatorcloud.py +++ b/shade/operatorcloud.py @@ -32,6 +32,10 @@ class OperatorCloud(openstackcloud.OpenStackCloud): See the :class:`OpenStackCloud` class for a description of most options. """ + def __init__(self, *args, **kwargs): + super(OperatorCloud, self).__init__(*args, **kwargs) + self._ironic_client = None + # Set the ironic API microversion to a known-good # supported/tested with the contents of shade. #