Replace logging with oslo_log for upgrade classes

* Replaces print with log.info
* Removes 'from __future__ import print_function'
* Replaces logging with oslo_log

Change-Id: Ib308935a237227dda05c6162152c6d99878802e2

tripleoclient/v1/overcloud_ceph_upgrade.py

@@ -13,7 +13,8 @@
 #   under the License.
 #
 
-import logging
+from oslo_config import cfg
+from oslo_log import log as logging
 
 from osc_lib.i18n import _
 
@@ -22,6 +23,10 @@ from tripleoclient import utils as oooutils
 from tripleoclient.v1.overcloud_deploy import DeployOvercloud
 from tripleoclient.workflows import package_update
 
+CONF = cfg.CONF
+logging.register_options(CONF)
+logging.setup(CONF, '')
+
 
 class CephUpgrade(DeployOvercloud):
     """Run heat stack update for overcloud nodes to run Ceph upgrade."""
@@ -76,5 +81,5 @@ class CephUpgrade(DeployOvercloud):
                               container_registry=registry,
                               ceph_ansible_playbook=ceph_ansible_playbook)
         package_update.get_config(clients, container=stack_name)
-        print("Ceph Upgrade on stack {0} complete.".format(
-              parsed_args.stack))
+        self.log.info("Ceph Upgrade on stack {0} complete.".format(
+                      parsed_args.stack))

tripleoclient/v1/overcloud_ffwd_upgrade.py

@@ -12,7 +12,8 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 #
-import logging
+from oslo_config import cfg
+from oslo_log import log as logging
 
 from osc_lib.i18n import _
 from osc_lib import utils
@@ -24,6 +25,10 @@ from tripleoclient.v1.overcloud_deploy import DeployOvercloud
 from tripleoclient.workflows import deployment
 from tripleoclient.workflows import package_update
 
+CONF = cfg.CONF
+logging.register_options(CONF)
+logging.setup(CONF, '')
+
 
 class FFWDUpgradePrepare(DeployOvercloud):
     """Run heat stack update for overcloud nodes to refresh heat stack outputs.
@@ -104,8 +109,8 @@ class FFWDUpgradePrepare(DeployOvercloud):
             container=stack_name)
         oooutils.write_overcloudrc(stack_name, overcloudrcs)
 
-        print("FFWD Upgrade Prepare on stack {0} complete.".format(
-              parsed_args.stack))
+        self.log.info("FFWD Upgrade Prepare on stack {0} complete.".format(
+                      parsed_args.stack))
 
 
 class FFWDUpgradeRun(command.Command):
@@ -205,5 +210,5 @@ class FFWDUpgradeConverge(DeployOvercloud):
             constants.FFWD_UPGRADE_CONVERGE_ENV)
 
         super(FFWDUpgradeConverge, self).take_action(parsed_args)
-        print("FFWD Upgrade Converge on stack {0} complete.".format(
-              parsed_args.stack))
+        self.log.info("FFWD Upgrade Converge on stack {0} complete.".format(
+                      parsed_args.stack))

tripleoclient/v1/overcloud_update.py

@@ -12,8 +12,8 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 #
-
-import logging
+from oslo_config import cfg
+from oslo_log import log as logging
 
 from osc_lib.i18n import _
 from osc_lib import utils
@@ -24,6 +24,10 @@ from tripleoclient import utils as oooutils
 from tripleoclient.v1.overcloud_deploy import DeployOvercloud
 from tripleoclient.workflows import package_update
 
+CONF = cfg.CONF
+logging.register_options(CONF)
+logging.setup(CONF, '')
+
 
 class UpdatePrepare(DeployOvercloud):
     """Run heat stack update for overcloud nodes to refresh heat stack outputs.
@@ -83,8 +87,8 @@ class UpdatePrepare(DeployOvercloud):
                               container_registry=registry,
                               ceph_ansible_playbook=ceph_ansible_playbook)
         package_update.get_config(clients, container=stack_name)
-        print("Update init on stack {0} complete.".format(
-              parsed_args.stack))
+        self.log.info("Update init on stack {0} complete.".format(
+                      parsed_args.stack))
 
 
 class UpdateRun(command.Command):
@@ -188,5 +192,5 @@ class UpdateConverge(DeployOvercloud):
             constants.UPDATE_CONVERGE_ENV)
 
         super(UpdateConverge, self).take_action(parsed_args)
-        print("Update converge on stack {0} complete.".format(
-              parsed_args.stack))
+        self.log.info("Update converge on stack {0} complete.".format(
+                      parsed_args.stack))

tripleoclient/v1/overcloud_upgrade.py

@@ -12,7 +12,8 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 #
-import logging
+from oslo_config import cfg
+from oslo_log import log as logging
 
 from osc_lib.i18n import _
 from osc_lib import utils
@@ -25,6 +26,10 @@ from tripleoclient.v1.overcloud_deploy import DeployOvercloud
 from tripleoclient.workflows import deployment
 from tripleoclient.workflows import package_update
 
+CONF = cfg.CONF
+logging.register_options(CONF)
+logging.setup(CONF, '')
+
 
 class UpgradePrepare(DeployOvercloud):
     """Run heat stack update for overcloud nodes to refresh heat stack outputs.
@@ -87,8 +92,8 @@ class UpgradePrepare(DeployOvercloud):
             container=stack_name)
         oooutils.write_overcloudrc(stack_name, overcloudrcs)
 
-        print("Completed Overcloud Upgrade Prepare for stack {0}".format(
-              stack_name))
+        self.log.info("Completed Overcloud Upgrade Prepare for stack "
+                      "{0}".format(stack_name))
 
 
 class UpgradeRun(command.Command):
@@ -218,8 +223,8 @@ class UpgradeRun(command.Command):
 
         playbooks = (constants.MAJOR_UPGRADE_PLAYBOOKS
                      if playbook == 'all' else playbook)
-        print(("Completed Overcloud Upgrade Run for {0} with playbooks "
-               "{1} ").format(limit_hosts, playbooks))
+        self.log.info(("Completed Overcloud Upgrade Run for {0} with "
+                       "playbooks {1} ").format(limit_hosts, playbooks))
 
 
 class UpgradeConvergeOvercloud(DeployOvercloud):
@@ -253,5 +258,5 @@ class UpgradeConvergeOvercloud(DeployOvercloud):
             constants.UPGRADE_CONVERGE_ENV)
 
         super(UpgradeConvergeOvercloud, self).take_action(parsed_args)
-        print("Completed Overcloud Upgrade Converge for stack {0}".format(
-              stack.stack_name))
+        self.log.info("Completed Overcloud Upgrade Converge for stack {0}"
+                      .format(stack.stack_name))

tripleoclient/v1/tripleo_upgrade.py

@@ -12,12 +12,15 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 #
-from __future__ import print_function
-
-import logging
+from oslo_config import cfg
+from oslo_log import log as logging
 
 from tripleoclient.v1.tripleo_deploy import Deploy
 
+CONF = cfg.CONF
+logging.register_options(CONF)
+logging.setup(CONF, '')
+
 
 class Upgrade(Deploy):
     """Upgrade TripleO"""