openstack/heat
Code Issues Proposed changes

Updating template example github link

Browse Source
This commit is contained in:
Chris Alfonso 2012-03-20 09:50:09 -04:00
parent fb2227b804
commit f5e43a3ffc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ build
dist dist
heat.egg-info heat.egg-info
heat/vcsversion.py heat/vcsversion.py
tags

3
README.rst
View File

@ -34,8 +34,7 @@ shell2:
shell3: shell3:
heat create my_stack --template-url=https://raw.github.com/heat-api/heat/blob/master/templates/WordPress_Single_Instance.template heat create my_stack --template-url=https://raw.github.com/heat-api/heat/master/templates/WordPress_Single_Instance.template
References References
---------- ----------
* http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_CreateStack.html * http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_CreateStack.html

6
bin/heat
View File

@ -240,7 +240,7 @@ def jeos_create(options, arguments):
auth_url=os.getenv('OS_AUTH_URL'), auth_url=os.getenv('OS_AUTH_URL'),
strategy=os.getenv('OS_AUTH_STRATEGY', 'noauth')) strategy=os.getenv('OS_AUTH_STRATEGY', 'noauth'))
c = glance_client.Client(host="0.0.0.0", port=9292, client = glance_client.Client(host="0.0.0.0", port=9292,
use_ssl=False, auth_tok=None, creds=creds) use_ssl=False, auth_tok=None, creds=creds)
parameters = { parameters = {
@ -256,7 +256,7 @@ def jeos_create(options, arguments):
'owner': os.getenv('OS_AUTH_USER'), 'owner': os.getenv('OS_AUTH_USER'),
'container_format': 'bare'} 'container_format': 'bare'}
images = c.get_images(**parameters) images = client.get_images(**parameters)
for image in images: for image in images:
if image['name'] == distro: if image['name'] == distro:
print ' *** image already in glance: %s > %s' % (image['name'], image['id']) print ' *** image already in glance: %s > %s' % (image['name'], image['id'])
@ -264,7 +264,7 @@ def jeos_create(options, arguments):
try: try:
with open(qcow2_filename) as ifile: with open(qcow2_filename) as ifile:
image_meta = c.add_image(image_meta, ifile) image_meta = client.add_image(image_meta, ifile)
image_id = image_meta['id'] image_id = image_meta['id']
print " Added new image with ID: %s" % image_id print " Added new image with ID: %s" % image_id
print " Returned the following metadata for the new image:" print " Returned the following metadata for the new image:"