[CORD-1760]
Eliminate deprecated versions of OpenStack ansible modules
[CORD-1654]
Quote OpenStack passwords so all-numeric ones aren't interpreted as
integers by YAML parser
Change-Id: I729b146b7664d967ae79dbc814720559c39c2195
diff --git a/xos/synchronizer/steps/sync_controller_networks.yaml b/xos/synchronizer/steps/sync_controller_networks.yaml
index d3613d1..33622b0 100644
--- a/xos/synchronizer/steps/sync_controller_networks.yaml
+++ b/xos/synchronizer/steps/sync_controller_networks.yaml
@@ -19,56 +19,45 @@
connection: local
tasks:
- os_network:
- name: {{ name }}
- shared: true
- {% if not delete -%}
- state: present
- {% else -%}
- state: absent
- {% endif -%}
- auth:
- auth_url: {{ endpoint }}
- username: {{ admin_user }}
- password: {{ admin_password }}
- project_name: {{ admin_project }}
+ auth:
+ auth_url: "{{ endpoint }}"
+ username: "{{ admin_user }}"
+ password: "{{ admin_password }}"
+ project_name: "{{ admin_project }}"
+ name: "{{ name }}"
+ shared: true
+ {% if not delete -%}
+ state: present
+ {% else -%}
+ state: absent
+ {% endif -%}
{% if not delete %}
- os_subnet:
- name: {{ subnet_name }}
- network_name: {{ name }}
+ auth:
+ auth_url: "{{ endpoint }}"
+ username: "{{ admin_user }}"
+ password: "{{ admin_password }}"
+ project_name: "{{ admin_project }}"
+ name: "{{ subnet_name }}"
+ network_name: "{{ name }}"
{% if not delete -%}
state: present
- cidr: {{ cidr }}
- dns_nameservers: 8.8.8.8
+ cidr: "{{ cidr }}"
+ dns_nameservers: "8.8.8.8"
{% if use_vtn -%}
- gateway_ip: {{ gateway }}
+ gateway_ip: "{{ gateway }}"
+ {% else -%}
+ no_gateway_ip: yes
{% endif -%}
{% if start_ip -%}
- allocation_pool_start: {{ start_ip }}
+ allocation_pool_start: "{{ start_ip }}"
{% endif -%}
{% if end_ip -%}
- allocation_pool_end: {{ end_ip }}
+ allocation_pool_end: "{{ end_ip }}"
{% endif -%}
{% else -%}
state: absent
{% endif -%}
- auth:
- auth_url: {{ endpoint }}
- username: {{ admin_user }}
- password: {{ admin_password }}
- project_name: {{ admin_project }}
-
-{% if not use_vtn -%}
-# until we get 'no-gateway-ip' arg to os_subnet, in Ansible 2.2
-# https://github.com/ansible/ansible-modules-core/pull/3736
- - command:
- neutron \
- --os-auth-url {{ endpoint }} \
- --os-username {{ admin_user }} \
- --os-password {{ admin_password }} \
- --os-tenant-name {{ admin_project }} \
- subnet-update --no-gateway {{ subnet_name }}
-{% endif -%}
-
{% endif %}