diff options
6 files changed, 140 insertions, 64 deletions
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2 b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2 index f388df41..bffd6068 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2 +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_compute/templates/ceilometer.conf.j2 @@ -1,9 +1,3 @@ -{% set memcached_servers = [] %} -{% for host in haproxy_hosts.values() %} -{% set _ = memcached_servers.append('%s:11211'% host) %} -{% endfor %} -{% set memcached_servers = memcached_servers|join(',') %} - [DEFAULT] verbose = True rpc_backend = rabbit @@ -15,7 +9,6 @@ metering_secret = {{ metering_secret }} [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 diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf b/deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf index e4f98e82..e7946b5c 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/cinder-volume/templates/cinder.conf @@ -1,9 +1,3 @@ -{% set memcached_servers = [] %} -{% for host in haproxy_hosts.values() %} -{% set _ = memcached_servers.append('%s:11211'% host) %} -{% endfor %} -{% set memcached_servers = memcached_servers|join(',') %} - [DEFAULT] rootwrap_config = /etc/cinder/rootwrap.conf api_paste_confg = /etc/cinder/api-paste.ini @@ -59,7 +53,6 @@ idle_timeout = 30 [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 diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/tasks/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/tasks/main.yml index fd3e51d3..375e325d 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/tasks/main.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/tasks/main.yml @@ -63,7 +63,7 @@ file: src=/etc/neutron/plugins/ml2/ml2_conf.ini dest=/etc/neutron/plugin.ini state=link - name: config neutron - template: src=templates/neutron.conf + template: src=neutron.conf dest=/etc/neutron/neutron.conf backup=yes notify: - restart neutron compute service diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/templates/neutron.conf b/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/templates/neutron.conf new file mode 100644 index 00000000..a676e951 --- /dev/null +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/neutron-compute/templates/neutron.conf @@ -0,0 +1,105 @@ +[DEFAULT] +verbose = {{ VERBOSE }} +debug = {{ VERBOSE }} +state_path = /var/lib/neutron +lock_path = $state_path/lock +notify_nova_on_port_status_changes = True +notify_nova_on_port_data_changes = True +log_dir = /var/log/neutron +bind_host = {{ network_server_host }} +bind_port = 9696 +core_plugin = ml2 +service_plugins = router +api_paste_config = api-paste.ini +auth_strategy = keystone +dhcp_lease_duration = 86400 +allow_overlapping_ips = True +rpc_backend = rabbit +rpc_thread_pool_size = 240 +rpc_conn_pool_size = 100 +rpc_response_timeout = 300 +rpc_cast_timeout = 300 +notification_driver = neutron.openstack.common.notifier.rpc_notifier +default_notification_level = INFO +notification_topics = notifications +agent_down_time = 75 +network_scheduler_driver = neutron.scheduler.dhcp_agent_scheduler.ChanceScheduler +router_scheduler_driver = neutron.scheduler.l3_agent_scheduler.ChanceScheduler +api_workers = 8 +rpc_workers = 8 +notify_nova_on_port_status_changes = True +notify_nova_on_port_data_changes = True +nova_url = http://{{ internal_vip.ip }}:8774/v3 +nova_region_name = RegionOne +nova_admin_username = nova +nova_admin_password = {{ NOVA_PASS }} +nova_admin_auth_url = http://{{ internal_vip.ip }}:35357/v3 +send_events_interval = 2 + +[quotas] +quota_driver = neutron.db.quota_db.DbQuotaDriver +quota_items = network,subnet,port +default_quota = -1 +quota_network = 100 +quota_subnet = 100 +quota_port = 8000 +quota_security_group = 1000 +quota_security_group_rule = 1000 + +[agent] +root_helper = "sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf" +report_interval = 30 + +[keystone_authtoken] +auth_uri = http://{{ internal_vip.ip }}:5000 +auth_url = http://{{ internal_vip.ip }}:35357 +auth_type = password +project_domain_name = default +user_domain_name = default +project_name = service +username = neutron +password = {{ NEUTRON_PASS }} + +identity_uri = http://{{ internal_vip.ip }}:35357 +admin_tenant_name = service +admin_user = neutron +admin_password = {{ NEUTRON_PASS }} +signing_dir = $state_path/keystone-signing + +[database] +connection = mysql://neutron:{{ NEUTRON_DBPASS }}@{{ db_host }}/neutron +slave_connection = +max_retries = 10 +retry_interval = 10 +min_pool_size = 1 +max_pool_size = 100 +idle_timeout = 30 +use_db_reconnect = True +max_overflow = 100 +connection_debug = 0 +connection_trace = False +pool_timeout = 10 + +[service_providers] +service_provider=FIREWALL:Iptables:neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewllDriver:default + +{% if enable_fwaas %} +[fwaas] +driver = neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver +enabled = True +{% endif %} + +[nova] +auth_url = http://{{ internal_vip.ip }}:35357 +auth_type = password +project_domain_name = default +user_domain_name = default +project_name = service +username = nova +password = {{ NOVA_PASS }} + +[oslo_messaging_rabbit] +rabbit_host = {{ rabbit_host }} +rabbit_password = {{ RABBIT_PASS }} +rabbit_port = 5672 +rabbit_userid = {{ RABBIT_USER }} diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/tasks/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/tasks/main.yml index 7bb4f347..16315b36 100644 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/tasks/main.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/nova-compute/tasks/main.yml @@ -30,13 +30,6 @@ state=absent when: ansible_os_family == "Debian" -- name: update nova-compute conf - template: src=templates/{{ item }} dest=/etc/nova/{{ item }} - with_items: - - nova.conf - notify: - - restart nova-compute services - - name: get number of cpu support virtualization shell: egrep -c '(vmx|svm)' /proc/cpuinfo register: kvm_cpu_num @@ -44,6 +37,7 @@ - name: update nova-compute conf template: src={{ item }} dest=/etc/nova/{{ item }} with_items: + - nova.conf - nova-compute.conf notify: - restart nova-compute services 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 |