summaryrefslogtreecommitdiffstats
path: root/roles/nuage_node/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-15 09:51:06 -0400
committerGitHub <noreply@github.com>2017-08-15 09:51:06 -0400
commit6820f52b30270f3af9e6167102d9edc85af243d4 (patch)
treee93e3b9160756a03064f464c8022def1eae66ed4 /roles/nuage_node/tasks
parent80fee935c90165de89b698880ee3542c92b8bcb4 (diff)
parentbdfb4ef54b71c9f89fc7466f802b4b2647dde873 (diff)
downloadopenshift-6820f52b30270f3af9e6167102d9edc85af243d4.tar.gz
openshift-6820f52b30270f3af9e6167102d9edc85af243d4.tar.bz2
openshift-6820f52b30270f3af9e6167102d9edc85af243d4.tar.xz
openshift-6820f52b30270f3af9e6167102d9edc85af243d4.zip
Merge pull request #4767 from vareti/IptablesKubeProxy
Nuage changes to support IPTables kube-proxy in OpenShift
Diffstat (limited to 'roles/nuage_node/tasks')
-rw-r--r--roles/nuage_node/tasks/iptables.yml6
-rw-r--r--roles/nuage_node/tasks/main.yaml4
2 files changed, 10 insertions, 0 deletions
diff --git a/roles/nuage_node/tasks/iptables.yml b/roles/nuage_node/tasks/iptables.yml
index 847c8395d..95ee8643a 100644
--- a/roles/nuage_node/tasks/iptables.yml
+++ b/roles/nuage_node/tasks/iptables.yml
@@ -15,3 +15,9 @@
when: "'nuage-underlay-overlay' not in iptablesrules.stdout"
notify:
- save iptable rules
+
+- name: Allow docker daemon traffic from underlay to overlay
+ command: /sbin/iptables -t nat -A POSTROUTING ! -s {{ hostvars[groups.oo_first_master.0].openshift.master.sdn_cluster_network_cidr }} -o svc-pat-tap -j MASQUERADE -m comment --comment "nuage-docker-underlay-overlay"
+ when: "'nuage-docker-underlay-overlay' not in iptablesrules.stdout"
+ notify:
+ - save iptable rules
diff --git a/roles/nuage_node/tasks/main.yaml b/roles/nuage_node/tasks/main.yaml
index 9cd743304..66d6ef4ca 100644
--- a/roles/nuage_node/tasks/main.yaml
+++ b/roles/nuage_node/tasks/main.yaml
@@ -11,6 +11,10 @@
become: yes
lineinfile: dest={{ vrs_config }} regexp=^ACTIVE_CONTROLLER line='ACTIVE_CONTROLLER={{ vsc_active_ip }}'
+- name: Set the K8S/OSE Cluster service CIDR
+ become: yes
+ lineinfile: dest={{ vrs_config }} regexp=^K8S_SERVICE_IPV4_SUBNET line='K8S_SERVICE_IPV4_SUBNET={{ k8s_cluster_service_cidr }}'
+
- name: Set the Standby Controller
become: yes
lineinfile: dest={{ vrs_config }} regexp=^STANDBY_CONTROLLER line='STANDBY_CONTROLLER={{ vsc_standby_ip }}'