From 56fd071bcbd91c31ea2e4c41fa7ce87df16da421 Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Sat, 19 Mar 2016 16:19:13 +0000
Subject: [PATCH] Change deprecated options throughout Kolla

These options have all be deprecated/removed. This switches all
options to thier proper mitaka values.

TrivialFix
Change-Id: Ica8d5ea0d48da01ee11672a32890431acd6a306d
---
 ansible/roles/heat/templates/heat.conf.j2       |  1 -
 ansible/roles/neutron/templates/l3_agent.ini.j2 |  1 -
 ansible/roles/nova/templates/nova.conf.j2       | 10 ++--------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index cb521b2a6e..84e3a548c7 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -12,7 +12,6 @@ stack_domain_admin_password = {{ heat_domain_admin_password }}
 stack_user_domain_name = heat_user_domain
 
 rpc_backend = rabbit
-notification_driver = noop
 deferred_auth_method = trusts
 trusts_delegated_role = heat_stack_owner
 
diff --git a/ansible/roles/neutron/templates/l3_agent.ini.j2 b/ansible/roles/neutron/templates/l3_agent.ini.j2
index 1bb7234ee2..78c4b39c84 100644
--- a/ansible/roles/neutron/templates/l3_agent.ini.j2
+++ b/ansible/roles/neutron/templates/l3_agent.ini.j2
@@ -1,4 +1,3 @@
 # l3_agent.ini
 [DEFAULT]
 agent_mode = legacy
-external_network_bridge =
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 1cbb4d0cfd..2cc15abdc1 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -53,9 +53,9 @@ compute_driver = libvirt.LibvirtDriver
 my_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
 
 {% if nova_console == 'novnc' %}
+[vnc]
 novncproxy_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
 novncproxy_port = {{ nova_novncproxy_port }}
-[vnc]
 vncserver_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
 vncserver_proxyclient_address = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
 {% if inventory_hostname in groups['compute'] %}
@@ -94,14 +94,9 @@ rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_'
 lock_path = /var/lib/nova/tmp
 
 [glance]
-{% if enable_ceph | bool %}
-host = {{ kolla_internal_fqdn }}
-port = {{ glance_api_port }}
-{% else %}
 api_servers = {% for host in groups['glance-api'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ glance_api_port }}{% if not loop.last %},{% endif %}{% endfor %}
 
 num_retries = {{ groups['glance-api'] | length }}
-{% endif %}
 
 [cinder]
 catalog_info = volume:cinder:internalURL
@@ -113,7 +108,7 @@ metadata_proxy_shared_secret = {{ metadata_secret }}
 service_metadata_proxy = true
 
 auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_name = default
 user_domain_id = default
 project_name = service
@@ -156,7 +151,6 @@ images_rbd_ceph_conf = /etc/ceph/ceph.conf
 rbd_user = nova
 rbd_secret_uuid = {{ rbd_secret_uuid }}
 disk_cachemodes="network=writeback"
-live_migration_flag="VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST,VIR_MIGRATE_TUNNELLED"
 hw_disk_discard = unmap
 {% endif %}