← Back to branch summary

~yolanda.robla/ubuntu/precise/nova/essex-sru

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Monty Taylor, Chuck Short, Joseph Heck
  • Date: 2012-02-24 10:08:10 UTC
  • mfrom: (1.1.46)
  • Revision ID: package-import@ubuntu.com-20120224100810-1wnpdx8c1c43702w
Tags: 2012.1~e4~20120224.12913-0ubuntu1
https://launchpad.net/bugs/879666
[ Monty Taylor ]
* Move files from nova/locale to /usr/share/locale

[ Chuck Short ]
* debian/rules: Fix FTBFS.
* debian/control: Add depends on python-babel.
* debian/control: Add depends on python-iso8601.
* debian/nova-api-os-volume.install: Fix FTBS.
* debian/patches/libvirt-use-console-pipe.patch: Refreshed and 
  Re-enabled. (LP: #879666)
* debian/control: Make sure we install nova-cert

[ Joseph Heck ]
* debian/nova-console.install: Add nova-consoleauth.
* Add nova-api-ec2, nova-api-os-compute, and nova-api-os-volume.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/baremetal/dom.py
130
130
 
131
131
        try:
132
132
            self.baremetal_nodes.deactivate_node(fd['node_id'])
133
 
        except:
 
133
        except Exception:
134
134
            msg = _("Failed power down Bare-metal node %s")
135
135
            raise exception.NotFound(msg % fd['node_id'])
136
136
        self.change_domain_state(name, power_state.BUILDING)
139
139
                node_ip, name, fd['mac_address'], fd['ip_address'])
140
140
            self.change_domain_state(name, state)
141
141
            return state
142
 
        except:
 
142
        except Exception:
143
143
            LOG.debug(_("deactivate -> activate fails"))
144
144
            self.destroy_domain(name)
145
145
            raise
165
165
            self.store_domain()
166
166
            msg = _("After storing domains: %s")
167
167
            LOG.debug(msg % (self.domains))
168
 
        except:
 
168
        except Exception:
169
169
            LOG.debug(_("deactivation/removing domain failed"))
170
170
            raise
171
171
 
207
207
                node_ip, new_dom['name'], new_dom['mac_address'],
208
208
                new_dom['ip_address'], new_dom['user_data'])
209
209
            self.change_domain_state(new_dom['name'], state)
210
 
        except:
 
210
        except Exception:
211
211
            self.domains.remove(new_dom)
212
212
            self.baremetal_nodes.free_node(node_id)
213
213
            LOG.debug(_("Failed to boot Bare-metal node %s"), node_id)