openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Nova role should not default vars outside the nova namespace

Browse Source 
This patch resolves the following:

- Removing the default var declaration of glance_api_servers
  and declaring it within the functional test vars since the
  role does require the variable be defined.

- Fix absence of neutron_openvswitch_agent due to
  https://review.openstack.org/338129

- Adjust the use of rabbitmq vars to ensure that they're
  properly namespaced. https://review.openstack.org/339810

Co-Authored-By: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
Depends-On: Ibc0a5b70d4da2e905b10b4c1334b57a6f0f3b4ed
Change-Id: If33d3ce9e9dfee827a92c9c0813b7c0a18cb8a7b
Partial-Bug: #1596084
This commit is contained in:
Travis Truman 2016-07-12 13:38:06 +01:00
parent 3a428e706a
commit 1f7819c13b
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
defaults/main.yml
View File

@ -78,8 +78,11 @@ nova_api_db_max_pool_size: 120
nova_api_db_pool_timeout: 30
## RabbitMQ info
nova_rabbitmq_servers: 127.0.0.1
nova_rabbitmq_port: 5672
nova_rabbitmq_userid: nova
nova_rabbitmq_vhost: /nova
nova_rabbitmq_use_ssl: False
## RPC
nova_rpc_backend: rabbit
@ -249,7 +252,10 @@ nova_image_cache_manager_interval: 0
nova_resume_guests_state_on_host_boot: False
nova_dhcp_domain: novalocal
nova_default_schedule_zone: nova
glance_api_servers: "{{ glance_host }}:{{ glance_service_port }}"
# Comma separated list of Glance API servers
# nova_glance_api_servers:
nova_network_type: linuxbridge
nova_network_services:

8
templates/nova.conf.j2
View File

@ -160,7 +160,7 @@ vncserver_proxyclient_address = {{ nova_novncproxy_vncserver_proxyclient_address
# Glance
[glance]
api_servers = {{ glance_api_servers }}
api_servers = {{ nova_glance_api_servers }}
# Neutron
[neutron]
@ -235,12 +235,12 @@ lock_path = /var/lock/nova
[oslo_messaging_rabbit]
rabbit_port = {{ rabbitmq_port }}
rabbit_port = {{ nova_rabbitmq_port }}
rabbit_userid = {{ nova_rabbitmq_userid }}
rabbit_password = {{ nova_rabbitmq_password }}
rabbit_virtual_host = {{ nova_rabbitmq_vhost }}
rabbit_hosts = {{ rabbitmq_servers }}
rabbit_use_ssl = {{ rabbitmq_use_ssl }}
rabbit_hosts = {{ nova_rabbitmq_servers }}
rabbit_use_ssl = {{ nova_rabbitmq_use_ssl }}
{% if nova_virt_type == 'ironic' %}

3
tests/inventory
View File

@ -40,6 +40,8 @@ openstack1
openstack1
localhost
[neutron_openvswitch_agent]
[neutron_metering_agent]
openstack1
@ -59,6 +61,7 @@ openstack1
neutron_agent
neutron_dhcp_agent
neutron_linuxbridge_agent
neutron_openvswitch_agent
neutron_metering_agent
neutron_l3_agent
neutron_lbaas_agent

17
tests/test-vars.yml
View File

@ -27,6 +27,9 @@ glance_galera_database: glance
glance_git_install_branch: master
glance_host: "{{ internal_lb_vip_address }}"
glance_profiler_hmac_key: "secrete"
glance_rabbitmq_port: "{{ rabbitmq_port }}"
glance_rabbitmq_servers: "{{ rabbitmq_servers }}"
glance_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
glance_rabbitmq_password: "secrete"
glance_rabbitmq_userid: glance
glance_rabbitmq_vhost: /glance
@ -44,9 +47,9 @@ keystone_galera_address: 10.100.102.101
keystone_galera_database: keystone
keystone_git_install_branch: master
keystone_rabbitmq_password: "secrete"
keystone_rabbitmq_port: 5671
keystone_rabbitmq_servers: 10.100.102.101
keystone_rabbitmq_use_ssl: false
keystone_rabbitmq_port: "{{ rabbitmq_port }}"
keystone_rabbitmq_servers: "{{ rabbitmq_servers }}"
keystone_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
keystone_rabbitmq_userid: keystone
keystone_rabbitmq_vhost: /keystone
keystone_requirements_git_install_branch: master
@ -90,12 +93,16 @@ nova_developer_mode: true
nova_galera_address: 10.100.102.101
nova_galera_database: nova
nova_git_install_branch: master
nova_glance_api_servers: "http://{{ glance_host }}:{{ glance_service_port }}"
nova_keystone_auth_plugin: password
nova_management_address: "10.100.102.1"
nova_metadata_port: 8775
nova_metadata_proxy_secret: "secrete"
nova_novncproxy_vncserver_listen: localhost
nova_novncproxy_vncserver_proxyclient_address: localhost
nova_rabbitmq_port: "{{ rabbitmq_port }}"
nova_rabbitmq_servers: "{{ rabbitmq_servers }}"
nova_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
nova_rabbitmq_password: "secrete"
nova_rabbitmq_userid: nova
nova_rabbitmq_vhost: /nova
@ -118,9 +125,9 @@ openrc_os_password: "{{ keystone_auth_admin_password }}"
# libvirt-bin, leading to nova-compute failing to start.
# TODO(jmccrory) Revisit this at some point
pip_install_options: "--no-binary libvirt-python"
rabbitmq_port: 5671
rabbitmq_port: 5672
rabbitmq_servers: 10.100.102.101
rabbitmq_use_ssl: true
rabbitmq_use_ssl: False
tempest_developer_mode: True
tempest_git_install_branch: master
tempest_venv_tag: "{{ tempest_git_install_branch }}"