diff --git a/templates/ocata/nova.conf b/templates/ocata/nova.conf
index 244e2b5b..eec13d0e 100644
--- a/templates/ocata/nova.conf
+++ b/templates/ocata/nova.conf
@@ -10,15 +10,12 @@ dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
 logdir=/var/log/nova
 state_path=/var/lib/nova
-force_dhcp_release=True
 iscsi_helper=tgtadm
 libvirt_use_virtio_for_bridges=True
 connection_type=libvirt
 root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
-api_paste_config=/etc/nova/api-paste.ini
 volumes_path=/var/lib/nova/volumes
 enabled_apis=osapi_compute,metadata
-auth_strategy=keystone
 compute_driver=libvirt.LibvirtDriver
 use_ipv6 = {{ use_ipv6 }}
 osapi_compute_listen = {{ bind_host }}
@@ -31,11 +28,6 @@ transport_url = {{ transport_url }}
 
 osapi_compute_workers = {{ workers }}
 
-{% if additional_neutron_filters is defined %}
-scheduler_default_filters = {{ scheduler_default_filters }},{{ additional_neutron_filters }}
-{% else %}
-scheduler_default_filters = {{ scheduler_default_filters }}
-{% endif %}
 cpu_allocation_ratio = {{ cpu_allocation_ratio }}
 ram_allocation_ratio = {{ ram_allocation_ratio }}
 
@@ -92,7 +84,6 @@ firewall_driver = nova.virt.firewall.NoopFirewallDriver
 
 {% if network_manager and network_manager == 'neutron' -%}
 network_api_class = nova.network.neutronv2.api.API
-use_neutron = True
 {% else -%}
 network_manager = nova.network.manager.FlatDHCPManager
 {% endif -%}
@@ -139,7 +130,7 @@ api_servers = {{ glance_api_servers }}
 url = {{ neutron_url }}
 auth_strategy = keystone
 auth_section = keystone_authtoken
-auth_plugin = password
+auth_type = password
 {% endif -%}
 
 {% include "section-keystone-authtoken-mitaka" %}
@@ -154,7 +145,9 @@ enabled=True
 [conductor]
 workers = {{ workers }}
 
+{% if not transport_url %}
 {% include "section-rabbitmq-oslo" %}
+{% endif -%}
 
 [oslo_concurrency]
 lock_path=/var/lock/nova
@@ -179,3 +172,16 @@ memcache_servers = {{ memcached_servers }}
 #                  using the nova-cc <--> nova-compute
 #                  relation
 discover_hosts_in_cells_interval = 30
+
+{% if additional_neutron_filters is defined %}
+[filter_scheduler]
+enabled_filters = {{ scheduler_default_filters }},{{ additional_neutron_filters }}
+{% else %}
+enabled_filters = {{ scheduler_default_filters }}
+{% endif %}
+
+[api]
+auth_strategy=keystone
+
+[wsgi]
+api_paste_config=/etc/nova/api-paste.ini
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 435a3bf4..88ee5d20 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -752,8 +752,14 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
             })
 
         if self._get_openstack_release() >= self.xenial_ocata:
-            expected['DEFAULT']['use_neutron'] = 'True'
+            del expected['DEFAULT']['force_dhcp_release']
             del expected['DEFAULT']['network_manager']
+            del expected['oslo_messaging_rabbit']
+            expected['DEFAULT']['transport_url'] = u.not_null
+            del expected['DEFAULT']['auth_strategy']
+            expected['api'] = {'auth_strategy': 'keystone'}
+            del expected['DEFAULT']['api_paste_config']
+            expected['wsgi'] = {'api_paste_config': '/etc/nova/api-paste.ini'}
 
         for section, pairs in expected.iteritems():
             ret = u.validate_config_data(unit, conf, section, pairs)