← Back to branch summary

~usc-isi/nova/hpc-testing-old

« back to all changes in this revision

Viewing changes to nova/virt/libvirt_conn.py

  • Committer: John Paul Walters
  • Date: 2011-03-22 18:37:14 UTC
  • mfrom: (725.1.12 hpc-trunk)
  • Revision ID: jwalters@isi.edu-20110322183714-odxvddm0srnymti0
Merged changes into libvirt_conn_gpu.py and corrected the xpus default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/libvirt_conn.py
1049
1049
               'cpu_info': self.get_cpu_info(),
1050
1050
               #RLK
1051
1051
               'cpu_arch': FLAGS.cpu_arch,
1052
 
               'xpu_arch': 'None',
1053
 
               'xpus': 0,
1054
 
               'xpu_info': 'None',
 
1052
               'xpu_arch': FLAGS.xpu_arch,
 
1053
               'xpus': FLAGS.xpus,
 
1054
               'xpu_info': FLAGS.xpu_info,
1055
1055
               'net_arch': FLAGS.net_arch,
1056
1056
               'net_info': FLAGS.net_info,
1057
1057
               'net_mbps': FLAGS.net_mbps
1058
1058
               }
1059
1059
 
1060
1060
        compute_node_ref = service_ref['compute_node']
 
1061
        LOG.info(_('#### RLK: cpu_arch = %s ') % FLAGS.cpu_arch)
1061
1062
        if not compute_node_ref:
1062
1063
            LOG.info(_('Compute_service record created for %s ') % host)
1063
1064
            dic['service_id'] = service_ref['id']