diff options
| author | Eric Day <eday@oddments.org> | 2010-12-02 08:47:25 -0800 |
|---|---|---|
| committer | Eric Day <eday@oddments.org> | 2010-12-02 08:47:25 -0800 |
| commit | 1bcc4da8bbcfdfee8f5eed80e9115d51803f86e2 (patch) | |
| tree | a54a08c909df2bc63beb741e3f48e69ba94d83c8 /nova/compute | |
| parent | 6956057ac490c788cb94fbfd0af7fe6e91a7ca96 (diff) | |
| parent | f8afbcc08b65d4d6764a6dc66c804816573ab3b4 (diff) | |
| download | nova-1bcc4da8bbcfdfee8f5eed80e9115d51803f86e2.tar.gz nova-1bcc4da8bbcfdfee8f5eed80e9115d51803f86e2.tar.xz nova-1bcc4da8bbcfdfee8f5eed80e9115d51803f86e2.zip | |
Merged trunk and resolved conflicts.
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 7 | ||||
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/compute/monitor.py | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index e678be85d..83bd7faef 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -99,7 +99,6 @@ class ComputeAPI(base.Base): type_data = instance_types.INSTANCE_TYPES[instance_type] base_options = { 'reservation_id': utils.generate_uid('r'), - 'server_name': name, 'image_id': image_id, 'kernel_id': kernel_id, 'ramdisk_id': ramdisk_id, @@ -182,6 +181,12 @@ class ComputeAPI(base.Base): """ instance_ref = self.db.instance_create(context, kwargs) inst_id = instance_ref['id'] + # Set sane defaults if not specified + if 'display_name' not in kwargs: + display_name = "Server %s" % instance_ref['internal_id'] + instance_ref['display_name'] = display_name + self.db.instance_update(context, inst_id, + {'display_name': display_name}) elevated = context.elevated() if not security_groups: diff --git a/nova/compute/manager.py b/nova/compute/manager.py index a25b8f6f3..b5eb23b24 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -47,7 +47,7 @@ from nova import utils from nova.compute import power_state FLAGS = flags.FLAGS -flags.DEFINE_string('instances_path', utils.abspath('../instances'), +flags.DEFINE_string('instances_path', '$state_path/instances', 'where instances are stored on disk') flags.DEFINE_string('compute_driver', 'nova.virt.connection.get_connection', 'Driver to use for volume creation') diff --git a/nova/compute/monitor.py b/nova/compute/monitor.py index ce45b14f6..22653113a 100644 --- a/nova/compute/monitor.py +++ b/nova/compute/monitor.py @@ -46,7 +46,7 @@ flags.DEFINE_integer('monitoring_instances_delay', 5, 'Sleep time between updates') flags.DEFINE_integer('monitoring_instances_step', 300, 'Interval of RRD updates') -flags.DEFINE_string('monitoring_rrd_path', '/var/nova/monitor/instances', +flags.DEFINE_string('monitoring_rrd_path', '$state_path/monitor/instances', 'Location of RRD files') |