Merge pull request #133 from harlowja/master
Comment out exporting keystone vars
This commit is contained in:
commit
ca59acc05e
@ -190,9 +190,9 @@ class RcWriter(object):
|
||||
return to_set
|
||||
|
||||
def _get_misc_envs(self):
|
||||
key_params = keystone.get_shared_params(self.cfg, self.pw_gen)
|
||||
#key_params = keystone.get_shared_params(self.cfg, self.pw_gen)
|
||||
to_set = dict()
|
||||
to_set.update(key_params)
|
||||
#to_set.update(key_params)
|
||||
return to_set
|
||||
|
||||
def _generate_misc_env(self):
|
||||
|
@ -186,16 +186,18 @@ class Image(object):
|
||||
def _generate_check_names(self, url_fn):
|
||||
name_checks = list()
|
||||
name_checks.append(url_fn)
|
||||
name_checks.append("%s.img" % (url_fn))
|
||||
name_checks.append("%s-img" % (url_fn))
|
||||
name = url_fn
|
||||
for look_for in NAME_CLEANUPS:
|
||||
name = name.replace(look_for, '')
|
||||
name_checks.append(name)
|
||||
name_checks.append("%s.img" % (name))
|
||||
name_checks.append("%s-img" % (name))
|
||||
name = self._generate_img_name(url_fn)
|
||||
name_checks.append(name)
|
||||
name_checks.append("%s.img" % (name))
|
||||
name_checks.append("%s-img" % (name))
|
||||
name_checks.append(self._generate_img_name(url_fn))
|
||||
return set(name_checks)
|
||||
|
||||
def _extract_url_fn(self):
|
||||
|
6
euca.sh
6
euca.sh
@ -25,12 +25,12 @@ then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Now we start showing whats happening
|
||||
set -x
|
||||
|
||||
# Get user configuration
|
||||
source $CORE_RC
|
||||
|
||||
# Now we start showing whats happening
|
||||
set -x
|
||||
|
||||
# Set the ec2 url so euca2ools works
|
||||
export EC2_URL=$(keystone catalog --service ec2 | awk '/ publicURL / { print $4 }')
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user