aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/neutron-network/tasks
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2016-12-22 16:59:08 +0800
committerliyuenan <liyuenan@huawei.com>2016-12-26 17:54:43 +0800
commit6072a49adb33f2bce3f48b9c7b8be7d96cf8501c (patch)
treea78a15b915741bb3ef7ddd4a61a801dd9f46d577 /deploy/adapters/ansible/roles/neutron-network/tasks
parenta9041dbf7b68f56169e82de3c37601b7e86867b0 (diff)
Update ansible version
JIRA: COMPASS-511 Change-Id: Id0e83c65a08c9f9036b5d3a597b905e8a7bde6e8 Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/neutron-network/tasks')
-rwxr-xr-xdeploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml2
-rw-r--r--deploy/adapters/ansible/roles/neutron-network/tasks/igmp-router.yml2
-rw-r--r--deploy/adapters/ansible/roles/neutron-network/tasks/main.yml16
-rwxr-xr-xdeploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml2
4 files changed, 11 insertions, 11 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml
index aec714f3..49b6a7f1 100755
--- a/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml
+++ b/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml
@@ -18,7 +18,7 @@
- name: install firewall packages
action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
- with_items: firewall_packages
+ with_items: "{{ firewall_packages }}"
- name: enable auto start
file:
diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/igmp-router.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/igmp-router.yml
index 2ce16510..ec12b318 100644
--- a/deploy/adapters/ansible/roles/neutron-network/tasks/igmp-router.yml
+++ b/deploy/adapters/ansible/roles/neutron-network/tasks/igmp-router.yml
@@ -9,7 +9,7 @@
---
- name: Install XORP to provide IGMP router functionality
action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
- with_items: xorp_packages
+ with_items: "{{ xorp_packages }}"
- name: create xorp directory
file: path=/etc/xorp state=directory
diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml
index 31f7f17c..753d281a 100644
--- a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml
@@ -23,13 +23,13 @@
- name: assert kernel support for vxlan
command: modinfo -F version vxlan
- when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES }}"
+ when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES | to_json }}"
- name: assert iproute2 suppport for vxlan
command: ip link add type vxlan help
register: iproute_out
failed_when: iproute_out.rc == 255
- when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES }}"
+ when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES | to_json }}"
- name: disable auto start
copy:
@@ -40,7 +40,7 @@
- name: install neutron network related packages
action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
- with_items: packages | union(packages_noarch)
+ with_items: "{{ packages | union(packages_noarch) }}"
- name: enable auto start
file:
@@ -50,7 +50,7 @@
- name: generate neutron network service list
lineinfile: dest=/opt/service create=yes line='{{ item }}'
- with_items: services | union(services_noarch)
+ with_items: "{{ services | union(services_noarch) }}"
- name: fix openstack neutron plugin config file
shell: |
@@ -97,7 +97,7 @@
dest: /etc/neutron/dnsmasq-neutron.conf
regexp: '^dhcp-option-force'
line: 'dhcp-option-force=26,1450'
- when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES }}"
+ when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES | to_json }}"
- include: firewall.yml
when: enable_fwaas == True
@@ -106,12 +106,12 @@
when: enable_vpnaas == True
- include: odl.yml
- when: "'opendaylight' in {{ NEUTRON_MECHANISM_DRIVERS }}"
+ when: "'opendaylight' in {{ NEUTRON_MECHANISM_DRIVERS | to_json }}"
- name: restart neutron network relation service
service: name={{ item }} state=restarted enabled=yes
with_flattened:
- - services_noarch
- - services
+ - "{{ services_noarch }}"
+ - "{{ services }}"
- meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml
index 9722ab7c..925eb709 100755
--- a/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml
+++ b/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml
@@ -18,7 +18,7 @@
- name: install vpn packages
action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
- with_items: vpn_packages
+ with_items: "{{ vpn_packages }}"
- name: enable auto start
file: