openstack/openstack-ansible-os_octavia
Code Issues Proposed changes

Use interface instead of endpoint_type

Browse Source 
The endpoint_type argument is not correct for the newer
os_* modules, so we switch to using the interface arument
instead.

Change-Id: I932d27bfffd93665feb00d13f30aaf9daacfaace
This commit is contained in:
Jesse Pretorius 2018-08-06 18:55:33 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 54c58ef5f8
commit 456268568d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/octavia_amp_image.yml
View File

@ -48,7 +48,7 @@
cloud: default cloud: default
region_name: "{{ octavia_service_region }}" region_name: "{{ octavia_service_region }}"
image: amphora-x64-haproxy image: amphora-x64-haproxy
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
when: when:
- octavia_download_result | changed - octavia_download_result | changed
@ -75,7 +75,7 @@
state: absent state: absent
region_name: "{{ octavia_service_region }}" region_name: "{{ octavia_service_region }}"
id: "{{ openstack.id }}" id: "{{ openstack.id }}"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
when: when:
- openstack is defined # result from os_image_facts - openstack is defined # result from os_image_facts

2
tasks/octavia_mgmt_network.yml
View File

@ -79,7 +79,7 @@
cloud: default cloud: default
region_name: "{{ octavia_service_region }}" region_name: "{{ octavia_service_region }}"
name: "{{ octavia_neutron_management_network_name }}" name: "{{ octavia_neutron_management_network_name }}"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
register: get_net_facts register: get_net_facts
until: get_net_facts is success until: get_net_facts is success

8
tasks/octavia_security_group.yml
View File

@ -36,7 +36,7 @@
state: present state: present
name: "{{ octavia_security_group_name }}" name: "{{ octavia_security_group_name }}"
description: "security group for octavia amphora" description: "security group for octavia amphora"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
- name: Create security group rule for agent - name: Create security group rule for agent
@ -54,7 +54,7 @@
port_range_max: "{{ octavia_agent_port }}" port_range_max: "{{ octavia_agent_port }}"
remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}" remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}"
security_group: "{{ octavia_security_group_name }}" security_group: "{{ octavia_security_group_name }}"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
- name: Create security group rule for ssh - name: Create security group rule for ssh
@ -72,7 +72,7 @@
port_range_min: 22 port_range_min: 22
port_range_max: 22 port_range_max: 22
remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}" remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
when: when:
- octavia_ssh_enabled | bool - octavia_ssh_enabled | bool
@ -90,7 +90,7 @@
security_group: "{{ octavia_security_group_name }}" security_group: "{{ octavia_security_group_name }}"
protocol: icmp protocol: icmp
remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}" remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
when: when:
- debug | bool - debug | bool

10
tasks/octavia_service_add.yml
View File

@ -31,7 +31,7 @@
name: "{{ octavia_service_name }}" name: "{{ octavia_service_name }}"
service_type: "{{ octavia_service_type }}" service_type: "{{ octavia_service_type }}"
description: "{{ octavia_service_description }}" description: "{{ octavia_service_description }}"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service is success until: add_service is success
@ -46,7 +46,7 @@
password: "{{ octavia_service_password }}" password: "{{ octavia_service_password }}"
domain: default domain: default
default_project: "{{ octavia_service_project_name }}" default_project: "{{ octavia_service_project_name }}"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service register: add_service
when: not octavia_service_in_ldap | bool when: not octavia_service_in_ldap | bool
@ -62,7 +62,7 @@
user: "{{ octavia_service_user_name }}" user: "{{ octavia_service_user_name }}"
role: "{{ octavia_service_role_name }}" role: "{{ octavia_service_role_name }}"
project: "{{ octavia_service_project_name }}" project: "{{ octavia_service_project_name }}"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service register: add_service
when: not octavia_service_in_ldap | bool when: not octavia_service_in_ldap | bool
@ -78,7 +78,7 @@
endpoint_interface: "{{ item.interface }}" endpoint_interface: "{{ item.interface }}"
url: "{{ item.url }}" url: "{{ item.url }}"
region: "{{ octavia_service_region }}" region: "{{ octavia_service_region }}"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service register: add_service
until: add_service is success until: add_service is success
@ -98,7 +98,7 @@
cloud: default cloud: default
state: present state: present
name: "{{ item }}" name: "{{ item }}"
endpoint_type: admin interface: admin
verify: "{{ not keystone_service_adminuri_insecure }}" verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_roles register: add_roles
until: add_roles is success until: add_roles is success