diff options
author | 2016-12-14 17:12:41 +0800 | |
---|---|---|
committer | 2016-12-14 09:21:20 +0000 | |
commit | 3b6e6b21e578a44504573aba2b8cfe1603879caa (patch) | |
tree | 7826fa68fa38f53816edcd3058339b2161478e8a /deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates | |
parent | 8a4b5bd61fc39c259952871c4447297f3184a0ba (diff) |
Support expansion for newton
JIRA: COMPASS-481
Change-Id: I2dc6230f808a62f6b852f0668771b7302c7b540c
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates')
-rw-r--r-- | deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates/nova.conf | 75 |
1 files changed, 33 insertions, 42 deletions
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates/nova.conf b/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates/nova.conf index 76728b27..8d7e9a5f 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates/nova.conf +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/templates/nova.conf @@ -1,10 +1,10 @@ -{% set memcached_servers = [] %} -{% for host in haproxy_hosts.values() %} -{% set _ = memcached_servers.append('%s:11211'% host) %} -{% endfor %} -{% set memcached_servers = memcached_servers|join(',') %} - [DEFAULT] +transport_url = rabbit://{{ RABBIT_USER }}:{{ RABBIT_PASS }}@{{ rabbit_host }} +auth_strategy = keystone +my_ip = {{ internal_ip }} +use_neutron = True +firewall_driver = nova.virt.firewall.NoopFirewallDriver + dhcpbridge_flagfile=/etc/nova/nova.conf dhcpbridge=/usr/bin/nova-dhcpbridge log-dir=/var/log/nova @@ -13,25 +13,15 @@ force_dhcp_release=True verbose={{ VERBOSE }} ec2_private_dns_show_ip=True enabled_apis=osapi_compute,metadata - -auth_strategy = keystone -my_ip = {{ internal_ip }} -use_neutron = True -firewall_driver = nova.virt.firewall.NoopFirewallDriver -transport_url = rabbit://{{ RABBIT_USER }}:{{ RABBIT_PASS }}@{{ rabbit_host }} default_floating_pool={{ public_net_info.network }} metadata_listen={{ internal_ip }} linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver - iscsi_helper=tgtadm connection_type=libvirt root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf debug={{ DEBUG }} volumes_path=/var/lib/nova/volumes rpc_backend = rabbit -rabbit_host = {{ rabbit_host }} -rabbit_userid = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} osapi_compute_listen={{ internal_ip }} network_api_class = nova.network.neutronv2.api.API security_group_api = neutron @@ -40,34 +30,26 @@ instance_usage_audit_period = hour notify_on_state_change = vm_and_task_state notification_driver = nova.openstack.common.notifier.rpc_notifier notification_driver = ceilometer.compute.nova_notifier -memcached_servers = {{ memcached_servers }} -[database] -# The SQLAlchemy connection string used to connect to the database -connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova +[api_database] +connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova_api idle_timeout = 30 pool_timeout = 10 use_db_reconnect = True -[api_database] -connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova_api +[database] +connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova idle_timeout = 30 pool_timeout = 10 use_db_reconnect = True -[oslo_concurrency] -lock_path=/var/lib/nova/tmp - -[libvirt] -use_virtio_for_bridges=True - -[wsgi] -api_paste_config=/etc/nova/api-paste.ini +[glance] +api_servers = http://{{ internal_vip.ip }}:9292 +host = {{ internal_vip.ip }} [keystone_authtoken] auth_uri = http://{{ internal_vip.ip }}:5000 auth_url = http://{{ internal_vip.ip }}:35357 -memcached_servers = {{ memcached_servers }} auth_type = password project_domain_name = default user_domain_name = default @@ -80,17 +62,8 @@ admin_tenant_name = service admin_user = nova admin_password = {{ NOVA_PASS }} -[vnc] -enabled = True -vncserver_listen = {{ internal_ip }} -vncserver_proxyclient_address = {{ internal_ip }} -novncproxy_base_url = http://{{ public_vip.ip }}:6080/vnc_auto.html -novncproxy_host = {{ internal_ip }} -novncproxy_port = 6080 - -[glance] -api_servers = http://{{ internal_vip.ip }}:9292 -host = {{ internal_vip.ip }} +[libvirt] +use_virtio_for_bridges=True [neutron] url = http://{{ internal_vip.ip }}:9696 @@ -111,3 +84,21 @@ admin_username = neutron admin_password = {{ NEUTRON_PASS }} admin_auth_url = http://{{ internal_vip.ip }}:35357/v3 +[oslo_concurrency] +lock_path=/var/lib/nova/tmp + +[oslo_messaging_rabbit] +rabbit_host = {{ rabbit_host }} +rabbit_userid = {{ RABBIT_USER }} +rabbit_password = {{ RABBIT_PASS }} + +[vnc] +enabled = True +vncserver_listen = {{ internal_ip }} +vncserver_proxyclient_address = {{ internal_ip }} +novncproxy_base_url = http://{{ public_vip.ip }}:6080/vnc_auto.html +novncproxy_host = {{ internal_ip }} +novncproxy_port = 6080 + +[wsgi] +api_paste_config=/etc/nova/api-paste.ini |