← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/virt/baremetal/tilera.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/baremetal/tilera.py
27
27
import time
28
28
 
29
29
from nova.compute import power_state
30
 
from nova.openstack.common import cfg
31
30
from nova import exception
32
31
from nova import flags
33
32
from nova import log as logging
 
33
from nova.openstack.common import cfg
34
34
from nova import utils
35
35
 
36
36
FLAGS = flags.FLAGS
272
272
        out_msg = file.readline().find("Unreachable")
273
273
        utils.execute('sudo', 'rm', tile_output)
274
274
        if out_msg == -1:
275
 
            cmd = _("TILERA_BOARD_#%(node_id)s %(node_ip)s is ready")
276
 
            LOG.debug(cmd % locals())
 
275
            LOG.debug(_("TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"),
 
276
                      locals())
277
277
            return True
278
278
        else:
279
 
            cmd = _("TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready,"
280
 
                    " out_msg=%(out_msg)s")
281
 
            LOG.debug(cmd % local())
 
279
            LOG.debug(_("TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready,"
 
280
                        " out_msg=%(out_msg)s"), locals())
282
281
            self.power_mgr(node_id, 2)
283
282
            return False
284
283
 
289
288
        From basepath to /tftpboot, kernel is set based on the given mode
290
289
        such as 0-NoSet, 1-SetVmlinux, or 9-RemoveVmlinux.
291
290
        """
292
 
        cmd = _("Noting to do for tilera nodes: vmlinux is in CF")
293
 
        LOG.debug(cmd)
 
291
        LOG.debug(_("Noting to do for tilera nodes: vmlinux is in CF"))
294
292
 
295
293
    def sleep_mgr(self, time_in_seconds):
296
294
        """
327
325
            return power_state.RUNNING
328
326
        except Exception as ex:
329
327
            self.deactivate_node(node_id)
330
 
            raise exception.Error(_("Node is unknown error state."))
 
328
            raise exception.NovaException(_("Node is unknown error state."))
331
329
 
332
330
    def get_console_output(self, console_log, node_id):
333
331
        """