Merge "Add placement section to neutron.conf"

This commit is contained in:
Jenkins 2017-10-11 09:27:06 +00:00 committed by Gerrit Code Review
commit 149cd19630
4 changed files with 13 additions and 4 deletions

View File

@ -435,10 +435,11 @@ enable_vmtp: "no"
enable_watcher: "no"
enable_zun: "no"
designate_keystone_user: "designate"
ironic_keystone_user: "ironic"
neutron_keystone_user: "neutron"
nova_keystone_user: "nova"
designate_keystone_user: "designate"
placement_keystone_user: "placement"
# Nova fake driver and the number of fake driver per compute node
enable_nova_fake: "no"

View File

@ -150,3 +150,14 @@ connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch
[qos]
notification_drivers = {{ neutron_notification_drivers|map(attribute='name')|join(',') }}
{% endif %}
[placement]
auth_type = password
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
username = {{ placement_keystone_user }}
password = {{ placement_keystone_password }}
user_domain_name = {{ default_user_domain_name }}
project_name = service
project_domain_name = {{ default_project_domain_name }}
os_region_name = {{ openstack_region_name }}
os_interface = internal

View File

@ -1,5 +1,4 @@
---
placement_keystone_user: "placement"
msi_dir: "%SYSTEMDRIVE%\\OpenStack\\MSIs"
log_dir: "%SYSTEMDRIVE%\\OpenStack\\Log"
freerdp_msi_url: "https://cloudbase.it/downloads/FreeRDPWebConnect.msi"

View File

@ -235,8 +235,6 @@ placement_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{
nova_logging_debug: "{{ openstack_logging_debug }}"
placement_keystone_user: "placement"
openstack_nova_auth: "{{ openstack_auth }}"
openstack_placement_auth: "{{ openstack_auth }}"