openstack/kolla-ansible
Code Issues Proposed changes

Fix genconfig and reconfigure for magnum

Browse Source 
Genconfig and reconfigure failing for magnum.
Chainging magnum trust configuretion parameters
to user/domain names instead of ids so they don't
depend on register.yml task anymore.

Change-Id: I55fddf48eafc44892fd0ab96835bfb0b51849d37
Closes-bug: #1630248
This commit is contained in:
Martin Matyáš 2016-10-06 19:34:44 -07:00
parent b58147bcc0
commit 4fa2508e4f
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/magnum/defaults/main.yml
View File

@ -30,5 +30,7 @@ magnum_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ ma
magnum_logging_debug: "{{ openstack_logging_debug }}" magnum_logging_debug: "{{ openstack_logging_debug }}"
magnum_keystone_user: "magnum" magnum_keystone_user: "magnum"
magnum_trustee_domain_admin: "magnum_trustee_domain_admin"
magnum_trustee_domain: "magnum"
openstack_magnum_auth: "{'auth_url':'{{ openstack_auth.auth_url }}','username':'{{ openstack_auth.username }}','password':'{{ openstack_auth.password }}','project_name':'{{ openstack_auth.project_name }}'}" openstack_magnum_auth: "{'auth_url':'{{ openstack_auth.auth_url }}','username':'{{ openstack_auth.username }}','password':'{{ openstack_auth.password }}','project_name':'{{ openstack_auth.project_name }}'}"

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

@ -42,7 +42,7 @@
- name: Creating Magnum trustee domain - name: Creating Magnum trustee domain
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m os_keystone_domain -m os_keystone_domain
-a "name=magnum -a "name={{ magnum_trustee_domain }}
description='Owns users and projects created by magnum' description='Owns users and projects created by magnum'
auth={{ '{{ openstack_magnum_auth }}' }}" auth={{ '{{ openstack_magnum_auth }}' }}"
-e "{'openstack_magnum_auth':{{ openstack_magnum_auth }}}" -e "{'openstack_magnum_auth':{{ openstack_magnum_auth }}}"
@ -60,8 +60,8 @@
- name: Creating Magnum trustee user - name: Creating Magnum trustee user
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m os_user -m os_user
-a "name=magnum_trustee_domain_admin -a "name={{ magnum_trustee_domain_admin }}
domain=magnum domain={{ magnum_trustee_domain }}
password={{ magnum_keystone_password }} password={{ magnum_keystone_password }}
auth={{ '{{ openstack_magnum_auth }}' }}" auth={{ '{{ openstack_magnum_auth }}' }}"
-e "{'openstack_magnum_auth':{{ openstack_magnum_auth }}}" -e "{'openstack_magnum_auth':{{ openstack_magnum_auth }}}"
@ -72,15 +72,11 @@
delay: 5 delay: 5
run_once: True run_once: True
- name: Setting Magnum trustee user value
set_fact:
magnum_trustee_domain_admin_id: "{{ (trustee_user.stdout.split('localhost | SUCCESS => ')[1]|from_json).user.id }}"
- name: Creating Magnum trustee user role - name: Creating Magnum trustee user role
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m os_user_role -m os_user_role
-a "domain={{ magnum_trustee_domain_id }} -a "domain={{ magnum_trustee_domain_id }}
user={{ magnum_trustee_domain_admin_id }} user={{ magnum_trustee_domain_admin }}
role=admin role=admin
auth={{ '{{ openstack_magnum_auth }}' }}" auth={{ '{{ openstack_magnum_auth }}' }}"
-e "{'openstack_magnum_auth':{{ openstack_magnum_auth }}}" -e "{'openstack_magnum_auth':{{ openstack_magnum_auth }}}"

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

@ -53,8 +53,8 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
[trust] [trust]
trustee_domain_admin_password = {{ magnum_keystone_password }} trustee_domain_admin_password = {{ magnum_keystone_password }}
trustee_domain_admin_id = {{ magnum_trustee_domain_admin_id }} trustee_domain_admin_name = {{ magnum_trustee_domain_admin }}
trustee_domain_id = {{ magnum_trustee_domain_id}} trustee_domain_name = {{ magnum_trustee_domain }}
[oslo_concurrency] [oslo_concurrency]
lock_path = /var/lib/magnum/tmp lock_path = /var/lib/magnum/tmp