openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use octavia account instead of admin in octavia"

Browse Source
This commit is contained in:
Jenkins 2017-09-26 10:39:08 +00:00 committed by Gerrit Code Review
commit e7c6f25187
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/roles/octavia/tasks/register.yml
View File

@ -32,3 +32,15 @@
module_extra_vars: module_extra_vars:
openstack_octavia_auth: "{{ openstack_octavia_auth }}" openstack_octavia_auth: "{{ openstack_octavia_auth }}"
run_once: True run_once: True
- name: Adding octavia user into admin project
kolla_toolbox:
module_name: "os_user_role"
module_args:
user: "{{ octavia_keystone_user }}"
role: admin
project: admin
auth: "{{ '{{ openstack_octavia_auth }}' }}"
module_extra_vars:
openstack_octavia_auth: "{{ openstack_octavia_auth }}"
run_once: True

4
ansible/roles/octavia/templates/octavia.conf.j2
View File

@ -26,8 +26,8 @@ max_retries = -1
[service_auth] [service_auth]
auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
auth_type = password auth_type = password
username = {{ openstack_auth.username }} username = {{ octavia_keystone_user }}
password = {{ keystone_admin_password }} password = {{ octavia_keystone_password }}
user_domain_name = {{ default_user_domain_name }} user_domain_name = {{ default_user_domain_name }}
project_name = {{ openstack_auth.project_name }} project_name = {{ openstack_auth.project_name }}
project_domain_name = {{ default_project_domain_name }} project_domain_name = {{ default_project_domain_name }}