diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-06-20 21:53:01 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-06-20 21:53:01 +0000 |
| commit | db7796b0a42faafff450eedbd7c09609f008c6c7 (patch) | |
| tree | 053237cb7db70cd853c2a75e63af59e5c6ad250a /bin | |
| parent | 46e016348ff4303310af328fa1af8fab513632c9 (diff) | |
| parent | d835283ee86f31debc8c639b875c808b18e8dff8 (diff) | |
| download | nova-db7796b0a42faafff450eedbd7c09609f008c6c7.tar.gz nova-db7796b0a42faafff450eedbd7c09609f008c6c7.tar.xz nova-db7796b0a42faafff450eedbd7c09609f008c6c7.zip | |
Merge with parent
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 184d1d73b..48d576931 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -97,7 +97,6 @@ flags.DECLARE('vlan_start', 'nova.network.manager') flags.DECLARE('vpn_start', 'nova.network.manager') flags.DECLARE('fixed_range_v6', 'nova.network.manager') flags.DECLARE('gateway_v6', 'nova.network.manager') -flags.DECLARE('images_path', 'nova.image.local') flags.DECLARE('libvirt_type', 'nova.virt.libvirt.connection') flags.DEFINE_flag(flags.HelpFlag()) flags.DEFINE_flag(flags.HelpshortFlag()) @@ -1056,16 +1055,6 @@ class ImageCommands(object): machine_images = {} other_images = {} directory = os.path.abspath(directory) - # NOTE(vish): If we're importing from the images path dir, attempt - # to move the files out of the way before importing - # so we aren't writing to the same directory. This - # may fail if the dir was a mointpoint. - if (FLAGS.image_service == 'nova.image.local.LocalImageService' - and directory == os.path.abspath(FLAGS.images_path)): - new_dir = "%s_bak" % directory - os.rename(directory, new_dir) - os.mkdir(directory) - directory = new_dir for fn in glob.glob("%s/*/info.json" % directory): try: image_path = os.path.join(fn.rpartition('/')[0], 'image') @@ -1087,7 +1076,7 @@ class AgentBuildCommands(object): def create(self, os, architecture, version, url, md5hash, hypervisor='xen'): - """creates a new agent build + """Creates a new agent build. arguments: os architecture version url md5hash [hypervisor='xen']""" ctxt = context.get_admin_context() agent_build = db.agent_build_create(ctxt, @@ -1099,7 +1088,7 @@ class AgentBuildCommands(object): 'md5hash': md5hash}) def delete(self, os, architecture, hypervisor='xen'): - """deletes an existing agent build + """Deletes an existing agent build. arguments: os architecture [hypervisor='xen']""" ctxt = context.get_admin_context() agent_build_ref = db.agent_build_get_by_triple(ctxt, @@ -1107,7 +1096,7 @@ class AgentBuildCommands(object): db.agent_build_destroy(ctxt, agent_build_ref['id']) def list(self, hypervisor=None): - """lists all agent builds + """Lists all agent builds. arguments: <none>""" fmt = "%-10s %-8s %12s %s" ctxt = context.get_admin_context() @@ -1134,7 +1123,7 @@ class AgentBuildCommands(object): def modify(self, os, architecture, version, url, md5hash, hypervisor='xen'): - """update an existing agent build + """Update an existing agent build. arguments: os architecture version url md5hash [hypervisor='xen'] """ ctxt = context.get_admin_context() |