From 7173757a6190f4528d36053d82467c74dbf16b3f Mon Sep 17 00:00:00 2001 From: liyuenan Date: Wed, 18 Jan 2017 18:05:27 +0800 Subject: Ansible Module substitute for Shell Commands JIRA: COMPASS-520 After update ansible version to v3, keystone_user module only support v2 API. So we use Shell Commands now, but it will failed with high probability. Those Shell Commands should be instead by ansible modules to manage Identity users, projects or some other work like crate networks. Change-Id: I63d38b4a811a9c063ac4404da72787f594411b53 Signed-off-by: liyuenan --- .../ansible/roles/ext-network/tasks/main.yml | 54 ++++++++++++++-------- 1 file changed, 36 insertions(+), 18 deletions(-) (limited to 'deploy/adapters/ansible/roles/ext-network/tasks') diff --git a/deploy/adapters/ansible/roles/ext-network/tasks/main.yml b/deploy/adapters/ansible/roles/ext-network/tasks/main.yml index d212dd99..b73bb0a9 100644 --- a/deploy/adapters/ansible/roles/ext-network/tasks/main.yml +++ b/deploy/adapters/ansible/roles/ext-network/tasks/main.yml @@ -22,25 +22,43 @@ wait_for: port=9696 delay=10 timeout=60 host={{ internal_ip }} - name: create external net - shell: - . /opt/admin-openrc.sh; - neutron net-create \ - {{ public_net_info.network }} \ - --provider:network_type {{ public_net_info.type }} \ - --provider:physical_network {{ public_net_info.provider_network }} \ - --router:external "True" + os_network: + cloud: opnfv + name: "{{ public_net_info.network }}" + provider_network_type: "{{ public_net_info.type }}" + provider_physical_network: "{{ public_net_info.provider_network }}" + shared: false + external: "yes" + state: present + run_once: true when: public_net_info.enable == "True" - and inventory_hostname == groups['controller'][0] + and public_net_info.type == "flat" + +- name: create external net + os_network: + cloud: opnfv + name: "{{ public_net_info.network }}" + provider_network_type: "{{ public_net_info.type }}" + provider_physical_network: "{{ public_net_info.provider_network }}" + provider_segmentation_id: "{{ public_net_info.segment_id }}" + shared: false + external: "yes" + state: present + run_once: true + when: public_net_info.enable == "True" + and public_net_info.type != "flat" - name: create external subnet - shell: - . /opt/admin-openrc.sh; - neutron subnet-create \ - --name {{ public_net_info.subnet }} \ - --gateway {{ public_net_info.external_gw }} \ - --disable-dhcp \ - --allocation-pool \ - start={{ public_net_info.floating_ip_start }},end={{ public_net_info.floating_ip_end }} \ - {{ public_net_info.network }} {{ public_net_info.floating_ip_cidr }} + os_subnet: + cloud: opnfv + name: "{{ public_net_info.subnet }}" + network_name: "{{ public_net_info.network }}" + cidr: "{{ public_net_info.floating_ip_cidr }}" + enable_dhcp: "{{ public_net_info.enable_dhcp }}" + no_gateway_ip: "{{ public_net_info.no_gateway }}" + gateway_ip: "{{ public_net_info.external_gw }}" + allocation_pool_start: "{{ public_net_info.floating_ip_start }}" + allocation_pool_end: "{{ public_net_info.floating_ip_end }}" + state: present + run_once: true when: public_net_info.enable == "True" - and inventory_hostname == groups['controller'][0] -- cgit 1.2.3-korg