openstack/openstack-ansible
Code Issues Proposed changes

Merge pull request #182 from nrb/nova_juno

Browse Source 
Update Nova pins and config for Juno.
This commit is contained in:
Kevin Carter 2014-09-29 12:24:34 -05:00
commit d38e275cdc
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc_deployment/inventory/group_vars/nova_all.yml
View File

@ -73,7 +73,7 @@ nova_max_age: 0
git_repo: https://git.openstack.org/openstack/nova
git_fallback_repo: https://github.com/openstack/nova
git_etc_example: etc/nova/
git_install_branch: 9ada982ccdb974d43c1c94e59eb4b84e35a7997d
git_install_branch: master
service_pip_dependencies:
- MySQL-python

32
rpc_deployment/roles/nova_common/templates/nova.conf
View File

@ -33,8 +33,6 @@ rabbit_userid = {{ rabbit_userid }}
rabbit_password = {{ rabbit_password }}
rabbit_hosts = {{ rabbit_hosts }}
# Glance
glance_api_servers = {{ glance_service_adminurl }}
# Metadata
metadata_host = {{ internal_vip_address }}
@ -74,19 +72,9 @@ max_age = {{ nova_max_age }}
# Common
memcached_servers = {{ internal_vip_address }}:{{ memcached_port }}
# Neutron
neutron_url = {{ neutron_service_adminurl }}
neutron_region_name = {{ service_region }}
neutron_admin_tenant_name = {{ hostvars[groups['neutron_all'][0]]['service_admin_tenant_name'] }}
neutron_auth_strategy = keystone
neutron_admin_auth_url = {{ auth_admin_uri }}
neutron_admin_password = {{ neutron_service_password }}
neutron_admin_username = {{ hostvars[groups['neutron_all'][0]]['service_admin_username'] }}
neutron_metadata_proxy_shared_secret = {{ nova_metadata_proxy_secret }}
service_neutron_metadata_proxy = True
# Cinder
cinder_catalog_info = volume:cinder:internalURL
[cinder]
catalog_info = volume:cinder:internalURL
{% if nova_html5proxy_base_url is defined%}
@ -100,6 +88,22 @@ server_listen = {{ container_address }}
server_proxyclient_address = {{ container_address }}
{% endif %}
# Glance
[glance]
api_servers = {{ glance_service_adminurl }}
# Neutron
[neutron]
url = {{ neutron_service_adminurl }}
region_name = {{ service_region }}
admin_tenant_name = {{ hostvars[groups['neutron_all'][0]]['service_admin_tenant_name'] }}
auth_strategy = keystone
admin_auth_url = {{ auth_admin_uri }}
admin_password = {{ neutron_service_password }}
admin_username = {{ hostvars[groups['neutron_all'][0]]['service_admin_username'] }}
metadata_proxy_shared_secret = {{ nova_metadata_proxy_secret }}
service_metadata_proxy = True
[conductor]
use_local = false