openstack
/
openstack-ansible-os_octavia
Code Issues Proposed changes

Remove unneded url v2 variables 

We are setting an unnecessary url_v2 variables which translates to uri
variables. This change removes url_v2 variables and just uses uri
variables directly instead.

Change-Id: I891b94a8fb452e9fb5166e7c322d152060efdcce
This commit is contained in:
Albert Mikaelyan 2018-05-18 14:36:14 +03:00
parent 1f68982a54
commit e75abe946e
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -108,11 +108,8 @@ octavia_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(o
octavia_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(octavia_service_proto) }}"
octavia_service_type: load-balancer
octavia_service_publicuri: "{{ octavia_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ octavia_service_port }}"
octavia_service_publicurl_v2: "{{ octavia_service_publicuri }}/"
octavia_service_adminuri: "{{ octavia_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ octavia_service_port }}"
octavia_service_adminurl_v2: "{{ octavia_service_adminuri }}"
octavia_service_internaluri: "{{ octavia_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ octavia_service_port }}"
octavia_service_internalurl_v2: "{{ octavia_service_internaluri }}"
octavia_service_in_ldap: false

6
tasks/octavia_service_add.yml
View File

@ -83,11 +83,11 @@
service_type: "{{ octavia_service_type }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
endpoint_list:
- url: "{{ octavia_service_publicurl_v2 }}"
- url: "{{ octavia_service_publicuri }}"
interface: "public"
- url: "{{ octavia_service_internalurl_v2 }}"
- url: "{{ octavia_service_internaluri }}"
interface: "internal"
- url: "{{ octavia_service_adminurl_v2 }}"
- url: "{{ octavia_service_adminuri }}"
interface: "admin"
register: add_service_v2
until: add_service_v2|success

6
tests/os_octavia-overrides.yml
View File

@ -35,9 +35,9 @@ octavia_system_home_folder: "/var/lib/{{ octavia_system_user_name }}"
octavia_venv_tag: "testing"
octavia_developer_mode: True
octavia_git_install_branch: master
octavia_service_internalurl_v2: "http://{{ test_octavia_api_host }}:9876"
octavia_service_adminurl_v2: "{{ octavia_service_internalurl_v2 }}"
octavia_service_publicurl_v2: "{{ octavia_service_internalurl_v2 }}"
octavia_service_internaluri: "http://{{ test_octavia_api_host }}:9876"
octavia_service_adminuri: "{{ octavia_service_internaluri }}"
octavia_service_publicuri: "{{ octavia_service_internaluri }}"
octavia_service_password: "secrete"
octavia_service_name: octavia