openstack/kolla-ansible
Code Issues Proposed changes

Change deprecated options throughout Kolla

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

TrivialFix
Change-Id: Ica8d5ea0d48da01ee11672a32890431acd6a306d
This commit is contained in:
SamYaple 2016-03-19 16:19:13 +00:00
parent d4535b6dc3
commit 56fd071bcb
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/heat/templates/heat.conf.j2
View File

@ -12,7 +12,6 @@ stack_domain_admin_password = {{ heat_domain_admin_password }}
stack_user_domain_name = heat_user_domain stack_user_domain_name = heat_user_domain
rpc_backend = rabbit rpc_backend = rabbit
notification_driver = noop
deferred_auth_method = trusts deferred_auth_method = trusts
trusts_delegated_role = heat_stack_owner trusts_delegated_role = heat_stack_owner

1
ansible/roles/neutron/templates/l3_agent.ini.j2
View File

@ -1,4 +1,3 @@
# l3_agent.ini # l3_agent.ini
[DEFAULT] [DEFAULT]
agent_mode = legacy agent_mode = legacy
external_network_bridge =

10
ansible/roles/nova/templates/nova.conf.j2
View File

@ -53,9 +53,9 @@ compute_driver = libvirt.LibvirtDriver
my_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} my_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
{% if nova_console == 'novnc' %} {% if nova_console == 'novnc' %}
[vnc]
novncproxy_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} novncproxy_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
novncproxy_port = {{ nova_novncproxy_port }} novncproxy_port = {{ nova_novncproxy_port }}
[vnc]
vncserver_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} vncserver_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
vncserver_proxyclient_address = {{ 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'] %} {% 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 lock_path = /var/lib/nova/tmp
[glance] [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 %} 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 }} num_retries = {{ groups['glance-api'] | length }}
{% endif %}
[cinder] [cinder]
catalog_info = volume:cinder:internalURL catalog_info = volume:cinder:internalURL
@ -113,7 +108,7 @@ metadata_proxy_shared_secret = {{ metadata_secret }}
service_metadata_proxy = true service_metadata_proxy = true
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
auth_plugin = password auth_type = password
project_domain_name = default project_domain_name = default
user_domain_id = default user_domain_id = default
project_name = service project_name = service
@ -156,7 +151,6 @@ images_rbd_ceph_conf = /etc/ceph/ceph.conf
rbd_user = nova rbd_user = nova
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
disk_cachemodes="network=writeback" 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 hw_disk_discard = unmap
{% endif %} {% endif %}