openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Read glance protocol, port for glance_api_servers"

This commit is contained in:
Jenkins 2014-07-22 08:35:10 +00:00 committed by Gerrit Code Review
parent 53b6c96b62 6af5b94ec1
commit 034235d8d8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/nova/os-apply-config/etc/nova/nova.conf
View File

@ -57,7 +57,7 @@ api_paste_config=/etc/nova/api-paste.ini
auth_strategy=keystone
keystone_ec2_url=http://{{keystone.host}}:5000/v2.0/ec2tokens
# Imaging service
glance_api_servers={{glance.host}}:9292
glance_api_servers={{glance.protocol}}://{{glance.host}}:{{glance.port}}
# VNC configuration
{{#nova.public_ip}}

2
elements/seed-stack-config/config.json
View File

@ -20,6 +20,8 @@
},
"glance": {
"host": "127.0.0.1",
"port": "9292",
"protocol": "http",
"db": "mysql://glance:unset@localhost/glance",
"service-password": "unset",
"api": {