openstack/openstack-ansible
Code Issues Proposed changes

Nova.conf and Metadata-agent file consistency updates

Browse Source 
This PR resolves https://github.com/rcbops/ansible-lxc-rpc/issues/79 while
also cleaning up the nova.conf template file as well as the metadata-agent.ini file.

removed unused variables

commented everything and added port / caching as explicite settings

removed whitespace

File clean up

Commeneted everything as sections in the file. Added +metadata_host and +metadata_port.
Nothing else was added or removed however the contents were moved around in the file to
make it more consistent and legible.
This commit is contained in:
Kevin Carter 2014-09-07 21:07:37 -05:00
parent cfe01cb2a6
commit c33e5089d6
4 changed files with 97 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,11 +59,6 @@ service_names:
- nova-conductor
- nova-scheduler
# Endpoint used throughout various services, including nova
nova_metadata_ip: "{{ internal_vip_address }}"
nova_metadata_proxy_shared_secret: "{{ nova_metadata_proxy_secret }}"
## Nova global config
nova_cpu_mode: host-model
nova_linuxnet_interface_driver: nova.network.linux_net.NeutronLinuxBridgeInterfaceDriver

18
rpc_deployment/roles/neutron_common/templates/metadata_agent.ini
View File

@ -1,9 +1,25 @@
[DEFAULT]
debug = {{ debug|default('False') }}
verbose = {{ verbose|default('True') }}
# The Neutron user information for accessing the Neutron API.
auth_url = {{ auth_identity_uri }}
auth_region = {{ service_region }}
endpoint_type = adminURL
# TCP Port used by Nova metadata server
nova_metadata_ip = {{ internal_vip_address }}
nova_metadata_port = {{ nova_metadata_port|default('8775') }}
# Admin authentication
admin_tenant_name = {{ service_admin_tenant_name }}
admin_user = {{ service_admin_username }}
admin_password = {{ service_admin_password }}
nova_metadata_ip = {{ internal_vip_address }}
# Number of backlog requests to configure the metadata server socket with
metadata_proxy_shared_secret = {{ nova_metadata_proxy_secret }}
metadata_workers = 10
metadata_backlog = 128
# Metadata Caching
cache_url = memory://?default_ttl=5

2
rpc_deployment/roles/nova_common/tasks/main.yml
View File

@ -25,7 +25,7 @@
- name: Set variable data
set_fact:
neutron_service_adminurl: "{{ neutronendpoint.stdout }}"
neutron_service_adminurl: "{{ neutronendpoint.stdout }}"
glance_service_adminurl: "{{ glanceendpoint.stdout }}"
- name: Setup nova config

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

@ -1,22 +1,80 @@
[DEFAULT]
debug = {{ debug }}
verbose = {{ verbose }}
# Logs / State
debug = {{ debug|default('False') }}
verbose = {{ verbose|default('True') }}
log_dir = /var/log/nova
state_path = /var/lib/nova
lock_path = /var/lock/nova
rootwrap_config = /etc/nova/rootwrap.conf
log_dir=/var/log/nova
# Scheduler
scheduler_driver = nova.scheduler.filter_scheduler.FilterScheduler
## VIF
linuxnet_interface_driver={{ nova_linuxnet_interface_driver }}
libvirt_vif_driver={{ nova_libvirt_vif_driver }}
libvirt_vif_type=ethernet
# Compute
compute_driver = {{ nova_compute_driver }}
instance_name_template = instance-%08x
instances_path = /var/lib/nova/instances
api_paste_config = /etc/nova/api-paste.ini
allow_resize_to_same_host = False
# Api's
enabled_apis = osapi_compute,metadata,ec2
ec2_dmz_host = {{ external_vip_address }}
s3_port = 3333
s3_host = {{ ansible_ssh_host }}
# Rpc all
amqp_auto_delete = False
rpc_backend = {{ rpc_backend }}
# RabbitMQ
rabbit_port = {{ rabbit_port }}
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 }}
metadata_port = {{ nova_metadata_port|default('8775') }}
# Network
force_dhcp_release = True
dhcpbridge_flagfile = /etc/nova/nova.conf
firewall_driver = {{ nova_firewall_driver }}
my_ip = {{ container_address }}
default_floating_pool = public
security_group_api = neutron
network_api_class = nova.network.neutronv2.api.API
# VNC disabled, see spice section
vnc_enabled = False
# Authentication
auth_strategy = keystone
## Vif
linuxnet_interface_driver = {{ nova_linuxnet_interface_driver }}
libvirt_vif_driver = {{ nova_libvirt_vif_driver }}
libvirt_vif_type = ethernet
vif_plugging_timeout = 10
vif_plugging_is_fatal = False
# Hypervisor
default_ephemeral_format = ext4
service_neutron_metadata_proxy = True
auth_strategy = keystone
security_group_api = neutron
# Configdrive
force_config_drive = always
# Policy
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'] }}
@ -24,64 +82,13 @@ 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_shared_secret }}
network_api_class = nova.network.neutronv2.api.API
firewall_driver = {{ nova_firewall_driver }}
compute_driver = {{ nova_compute_driver }}
neutron_metadata_proxy_shared_secret = {{ nova_metadata_proxy_secret }}
service_neutron_metadata_proxy = True
# Cinder
cinder_catalog_info = volume:cinder:internalURL
glance_api_servers={{ glance_service_adminurl }}
## Rabbit / RPC
amqp_auto_delete = False
rabbit_port={{ rabbit_port }}
rabbit_userid={{ rabbit_userid }}
rabbit_password={{ rabbit_password }}
rpc_backend={{ rpc_backend }}
rabbit_hosts = {{ rabbit_hosts }}
## VNC
# disabled, see spice section
vnc_enabled = False
force_config_drive = always
instances_path = /var/lib/nova/instances
lock_path=/var/lock/nova
state_path=/var/lib/nova
enabled_apis = osapi_compute,metadata,ec2
instance_name_template = instance-%08x
my_ip = {{ container_address }}
s3_port = 3333
s3_host = {{ ansible_ssh_host }}
ec2_dmz_host = {{ external_vip_address }}
default_floating_pool = public
force_dhcp_release = True
dhcpbridge_flagfile = /etc/nova/nova.conf
scheduler_driver = nova.scheduler.filter_scheduler.FilterScheduler
rootwrap_config = /etc/nova/rootwrap.conf
api_paste_config = /etc/nova/api-paste.ini
allow_resize_to_same_host = False
# Fix for regression pr-376
max_age = {{ nova_max_age }}
# Required by consoleauth
memcached_servers = {{ internal_vip_address }}:{{ memcached_port }}
{% if nova_html5proxy_base_url is defined%}
[spice]
agent_enabled = {{ nova_console_agent_enabled|default('True') }}
@ -95,13 +102,9 @@ server_proxyclient_address = {{ container_address }}
[conductor]
use_local=false
topic=conductor
manager=nova.conductor.manager.ConductorManager
[database]
connection = mysql://{{ container_mysql_user }}:{{ container_mysql_password }}@{{ mysql_address }}/{{ container_database }}?charset=utf8
use_local = false
topic = conductor
manager = nova.conductor.manager.ConductorManager
[osapi_v3]
@ -127,10 +130,14 @@ memcache_secret_key = {{ memcached_secret_key }}
check_revocations_for_cached = {{ hostvars[groups['keystone_all'][0]]['keystone_use_pki'] }}
[database]
connection = mysql://{{ container_mysql_user }}:{{ container_mysql_password }}@{{ mysql_address }}/{{ container_database }}?charset=utf8
[libvirt]
vif_driver = {{ nova_libvirt_vif_driver }}
inject_partition = -2
use_usb_tablet = False
use_virtio_for_bridges=True
use_virtio_for_bridges = True
cpu_mode = {{ nova_cpu_mode }}
virt_type = {{ virt_type }}