Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/configurations/cord/dataplane/dataplane.yaml b/xos/configurations/cord/dataplane/dataplane.yaml
index f43e4d7..489609a 100644
--- a/xos/configurations/cord/dataplane/dataplane.yaml
+++ b/xos/configurations/cord/dataplane/dataplane.yaml
@@ -158,6 +158,14 @@
shell: ifconfig br-lan inet6 del {{ ipv6.stdout }}
when: ipv6.stdout != ""
+ - name: Check if veth1 has an IPv6 address
+ shell: ip addr show veth1|grep inet6|awk '{print $2}'
+ register: ipv6
+
+ - name: Remove veth1 IPv6 address if present
+ shell: ifconfig veth1 inet6 del {{ ipv6.stdout }}
+ when: ipv6.stdout != ""
+
- name: Run the datapath
command: /usr/local/bin/ofdatapath -i veth1,br-lan punix:/tmp/s1 -d 000000000001 --no-slicing -D -P
creates=/usr/local/var/run/ofdatapath.pid