← Back to branch summary

~tribaal/charms/precise/storage/make-local-provider-answer

« back to all changes in this revision

Viewing changes to hooks/storage-provider.d/nova/common

  • Committer: David Britton
  • Date: 2013-12-06 04:26:45 UTC
  • Revision ID: dpb@canonical.com-20131206042645-2t52tg7b0mikgbrr
remove "storage" from front of config options

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/storage-provider.d/nova/common
2
2
 
3
3
METADATA_URL=http://169.254.169.254/openstack/2012-08-10/meta_data.json
4
4
LETTERS="b c d e f g h i j k l m n o p r s t u v w x y z"
5
 
VOLUME_NAME=$(config-get storage_id)
 
5
VOLUME_NAME=$(config-get id)
6
6
MOUNT=${1:-/mnt/storage}
7
7
OPTIONS=default
8
8
ORIG=/tmp/storage-orig-disks
9
9
NEW=/tmp/storage-new-disks
10
10
PERSIST=~/charm-storage-nova-device
11
11
 
12
 
export OS_USERNAME=$(config-get storage_key)
13
 
export OS_TENANT_NAME=$(config-get storage_tenant)
14
 
export OS_PASSWORD=$(config-get storage_secret)
15
 
export OS_AUTH_URL=$(config-get storage_endpoint)
16
 
export OS_REGION_NAME=$(config-get storage_region)
 
12
export OS_USERNAME=$(config-get key)
 
13
export OS_TENANT_NAME=$(config-get tenant)
 
14
export OS_PASSWORD=$(config-get secret)
 
15
export OS_AUTH_URL=$(config-get endpoint)
 
16
export OS_REGION_NAME=$(config-get region)
17
17
 
18
18
# Strip forward and trailing quote if there.
19
19
INSTANCE_ID=`curl $METADATA_URL | jsonpipe | grep uuid | awk '{ print $2 }'`