From 4da762dd13af4bd1a99541766d4fa98146322e14 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Thu, 9 Apr 2020 10:34:21 +0100 Subject: [PATCH] Use ansible openstack collection Depends-On: https://review.opendev.org/718431 Depends-On: https://review.opendev.org/718362 Change-Id: I84300d787610ed185b6755f625eea91135ce9cde --- tasks/octavia_amp_image.yml | 4 ++-- tasks/octavia_flavor_create.yml | 2 +- tasks/octavia_mgmt_network.yml | 4 ++-- tasks/octavia_post_install.yml | 4 ++-- tasks/octavia_security_group.yml | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tasks/octavia_amp_image.yml b/tasks/octavia_amp_image.yml index ebc00fd3..76db10e5 100644 --- a/tasks/octavia_amp_image.yml +++ b/tasks/octavia_amp_image.yml @@ -47,7 +47,7 @@ - octavia_download_result is changed block: - name: Get current image id - os_image_info: + openstack.cloud.os_image_info: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}" @@ -80,7 +80,7 @@ amphora-x64-haproxy - name: Delete old image from glance - os_image: + openstack.cloud.os_image: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}" diff --git a/tasks/octavia_flavor_create.yml b/tasks/octavia_flavor_create.yml index 6f8c6fae..5e617df7 100644 --- a/tasks/octavia_flavor_create.yml +++ b/tasks/octavia_flavor_create.yml @@ -25,7 +25,7 @@ block: - name: Create Octavia Flavor run_once: true - os_nova_flavor: + openstack.cloud.os_nova_flavor: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}" diff --git a/tasks/octavia_mgmt_network.yml b/tasks/octavia_mgmt_network.yml index e3d0a130..26440ed4 100644 --- a/tasks/octavia_mgmt_network.yml +++ b/tasks/octavia_mgmt_network.yml @@ -25,7 +25,7 @@ block: - name: Create mgmt network run_once: true - os_network: + openstack.cloud.os_network: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}" @@ -50,7 +50,7 @@ - name: Ensure mgmt subnet exists run_once: true - os_subnet: + openstack.cloud.os_subnet: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}" diff --git a/tasks/octavia_post_install.yml b/tasks/octavia_post_install.yml index 9f1c756b..4921d537 100644 --- a/tasks/octavia_post_install.yml +++ b/tasks/octavia_post_install.yml @@ -47,7 +47,7 @@ - octavia_nova_flavor_uuid is not defined block: - name: Get Octavia flavor details - os_flavor_info: + openstack.cloud.os_flavor_info: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}" @@ -75,7 +75,7 @@ - octavia_neutron_management_network_name is defined block: - name: Get octavia management network details - os_networks_info: + openstack.cloud.os_networks_info: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}" diff --git a/tasks/octavia_security_group.yml b/tasks/octavia_security_group.yml index 64e16cfa..1997daaf 100644 --- a/tasks/octavia_security_group.yml +++ b/tasks/octavia_security_group.yml @@ -24,7 +24,7 @@ ansible_python_interpreter: "{{ octavia_service_setup_host_python_interpreter }}" block: - name: Setup the service project quota - os_quota: + openstack.cloud.os_quota: cloud: default interface: admin name: "{{ octavia_service_project_name }}" @@ -38,7 +38,7 @@ port: "{{ octavia_num_ports }}" - name: Create Octavia security group - os_security_group: + openstack.cloud.os_security_group: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}" @@ -57,7 +57,7 @@ delay: 10 - name: Create security group rule for agent - os_security_group_rule: + openstack.cloud.os_security_group_rule: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}" @@ -79,7 +79,7 @@ delay: 10 - name: Create security group rule for ssh - os_security_group_rule: + openstack.cloud.os_security_group_rule: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}" @@ -103,7 +103,7 @@ - octavia_ssh_enabled | bool - name: Create security group rule for icmp - os_security_group_rule: + openstack.cloud.os_security_group_rule: auth: auth_url: "{{ keystone_service_adminurl }}" username: "{{ octavia_service_user_name }}"