openstack/kolla-ansible
Code Issues Proposed changes

Remove useless module_extra_vars in registry.yml

Browse Source 
- remove uesless module_extra_vars, this is a historical issue. In the
  past, we use 'docker exec kolla_toolbox ansible xxx' to run module on
  target node, so complex data have to pass through extra_vars. Now we
  are using kolla_toolbox module, no need to use extra_vars anymore.
- Remove some useless until.

Change-Id: I72ed28001202917f9a82a1c3ea33cd6319911ec8
This commit is contained in:
Jeffrey Zhang
2018-03-14 18:03:58 +08:00
parent 767d0523d1
commit 84ade4e149
35 changed files with 80 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,10 +10,8 @@
url: "{{ item.url }}"
interface: "{{ item.interface }}"
region_name: "{{ openstack_region_name }}"
auth: "{{ '{{ openstack_solum_auth }}' }}"
auth: "{{ openstack_solum_auth }}"
endpoint_type: "{{ openstack_interface }}"
module_extra_vars:
openstack_solum_auth: "{{ openstack_solum_auth }}"
run_once: True
with_items:
- {'interface': 'admin', 'url': '{{ solum_image_builder_admin_endpoint }}'}
@@ -31,10 +29,8 @@
url: "{{ item.url }}"
interface: "{{ item.interface }}"
region_name: "{{ openstack_region_name }}"
auth: "{{ '{{ openstack_solum_auth }}' }}"
auth: "{{ openstack_solum_auth }}"
endpoint_type: "{{ openstack_interface }}"
module_extra_vars:
openstack_solum_auth: "{{ openstack_solum_auth }}"
run_once: True
with_items:
- {'interface': 'admin', 'url': '{{ solum_application_deployment_admin_endpoint }}'}
@@ -50,8 +46,6 @@
password: "{{ solum_keystone_password }}"
role: "admin"
region_name: "{{ openstack_region_name }}"
auth: "{{ '{{ openstack_solum_auth }}' }}"
auth: "{{ openstack_solum_auth }}"
endpoint_type: "{{ openstack_interface }}"
module_extra_vars:
openstack_solum_auth: "{{ openstack_solum_auth }}"
run_once: True