Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 23CCE9A92 for ; Tue, 3 Apr 2012 15:11:33 +0000 (UTC) Received: (qmail 19318 invoked by uid 500); 3 Apr 2012 15:11:33 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 19283 invoked by uid 500); 3 Apr 2012 15:11:33 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 19173 invoked by uid 99); 3 Apr 2012 15:11:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Apr 2012 15:11:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2606AABCF; Tue, 3 Apr 2012 15:11:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marios@apache.org To: commits@deltacloud.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [7/7] git commit: Fixes typo in Openstack driver (instance create without specified hwp) Message-Id: <20120403151132.2606AABCF@tyr.zones.apache.org> Date: Tue, 3 Apr 2012 15:11:32 +0000 (UTC) Fixes typo in Openstack driver (instance create without specified hwp) Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/5a6e19cb Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/5a6e19cb Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/5a6e19cb Branch: refs/heads/master Commit: 5a6e19cb84a384a18b92e64b156a7c03742593c3 Parents: d30e89e Author: marios Authored: Tue Apr 3 15:04:22 2012 +0300 Committer: marios Committed: Tue Apr 3 15:04:22 2012 +0300 ---------------------------------------------------------------------- .../drivers/openstack/openstack_driver.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5a6e19cb/server/lib/deltacloud/drivers/openstack/openstack_driver.rb ---------------------------------------------------------------------- diff --git a/server/lib/deltacloud/drivers/openstack/openstack_driver.rb b/server/lib/deltacloud/drivers/openstack/openstack_driver.rb index 82a2b07..4c768c9 100644 --- a/server/lib/deltacloud/drivers/openstack/openstack_driver.rb +++ b/server/lib/deltacloud/drivers/openstack/openstack_driver.rb @@ -140,7 +140,7 @@ module Deltacloud params[:name] = (opts[:name] && opts[:name].length>0)? opts[:name] : Time.now.to_s params[:imageRef] = image_id params[:flavorRef] = (opts[:hwp_id] && opts[:hwp_id].length>0) ? - opts[:hwp_id] : hardware_profiles(credentials).first + opts[:hwp_id] : hardware_profiles(credentials).first.name if opts[:password] && opts[:password].length > 0 params[:adminPass]=opts[:password] end