diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-21 10:05:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-21 10:05:07 +0000 |
| commit | c14007578fd2b65afe0fe9ad7c25ef747be2ca40 (patch) | |
| tree | 515593f3f3ffb5ff0f88a8e21c99037049f7c39b /ansible | |
| parent | 059f708c5f43683c5f75b19bdeedcf1d5cf0c9a4 (diff) | |
| parent | 56fd071bcbd91c31ea2e4c41fa7ce87df16da421 (diff) | |
| download | kolla-c14007578fd2b65afe0fe9ad7c25ef747be2ca40.tar.gz kolla-c14007578fd2b65afe0fe9ad7c25ef747be2ca40.zip | |
Merge "Change deprecated options throughout Kolla"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/heat/templates/heat.conf.j2 | 1 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/l3_agent.ini.j2 | 1 | ||||
| -rw-r--r-- | 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 cb521b2a6..84e3a548c 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 1bb7234ee..78c4b39c8 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 ceb875938..b8cc3807d 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 %} |