Permalink
Browse files

[block_device] add openstack auth info to userid input

  • Loading branch information...
1 parent a34f93a commit aba6314f9c6f7624d191e000b6ccd7ca759013de @Neve Neve committed Nov 27, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 cookbooks/block_device/metadata.rb
@@ -78,7 +78,7 @@
attribute "block_device/devices/default/backup/primary/cred/user",
:display_name => "Primary Backup User (default)",
- :description => "Primary cloud authentication credentials. For Rackspace Cloud Files, use your Rackspace login username (e.g., cred:RACKSPACE_USERNAME). For clouds that do not require primary credentials (e.g., Amazon), set to 'ignore'.",
+ :description => "Primary cloud authentication credentials. For Rackspace Cloud Files, use your Rackspace login username (e.g., cred:RACKSPACE_USERNAME). For OpenStack Swift the format is: <tenant-id>:<user-name>. For clouds that do not require primary credentials (e.g., Amazon), set to 'ignore'.",
:required => "recommended",
:default => "",
:recipes => [ "block_device::default" ]
@@ -107,7 +107,7 @@
attribute "block_device/devices/default/backup/secondary/cred/user",
:display_name => "Secondary Backup User (default)",
- :description => "Secondary cloud authentication credentials. For Rackspace Cloud Files, use your Rackspace login username (e.g., cred:RACKSPACE_USERNAME). For Amazon S3, use your Amazon key ID (e.g., cred:AWS_ACCESS_KEY_ID).",
+ :description => "Secondary cloud authentication credentials. For Rackspace Cloud Files, use your Rackspace login username (e.g., cred:RACKSPACE_USERNAME). For OpenStack Swift the format is: <tenant-id>:<user-name>. For Amazon S3, use your Amazon key ID (e.g., cred:AWS_ACCESS_KEY_ID).",
:required => "recommended",
:default => "",
:recipes => [ "block_device::default", "block_device::do_secondary_backup", "block_device::do_secondary_restore" ]

0 comments on commit aba6314

Please sign in to comment.