diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml
index 3fc7f3fcb8..ab7d9dc482 100644
--- a/playbooks/groups/os-cluster.yml
+++ b/playbooks/groups/os-cluster.yml
@@ -20,6 +20,8 @@
     - collectd/base
     - rsyncd
     - sudo
+    - { role: openvpn/client,
+        when: env != "staging" }
 
   tasks:
     - name: put openshift 3.4 repo on os- systems
diff --git a/roles/openvpn/server/files/ccd/os-master01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-master01.phx2.fedoraproject.org
new file mode 100644
index 0000000000..8fea5162cd
--- /dev/null
+++ b/roles/openvpn/server/files/ccd/os-master01.phx2.fedoraproject.org
@@ -0,0 +1,2 @@
+# ifconfig-push actualIP PtPIP
+ifconfig-push 192.168.1.170 192.168.0.170
diff --git a/roles/openvpn/server/files/ccd/os-master02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-master02.phx2.fedoraproject.org
new file mode 100644
index 0000000000..e32832d3d7
--- /dev/null
+++ b/roles/openvpn/server/files/ccd/os-master02.phx2.fedoraproject.org
@@ -0,0 +1,2 @@
+# ifconfig-push actualIP PtPIP
+ifconfig-push 192.168.1.171 192.168.0.171
diff --git a/roles/openvpn/server/files/ccd/os-master03.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-master03.phx2.fedoraproject.org
new file mode 100644
index 0000000000..cffb6aa038
--- /dev/null
+++ b/roles/openvpn/server/files/ccd/os-master03.phx2.fedoraproject.org
@@ -0,0 +1,2 @@
+# ifconfig-push actualIP PtPIP
+ifconfig-push 192.168.1.172 192.168.0.172
diff --git a/roles/openvpn/server/files/ccd/os-node01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node01.phx2.fedoraproject.org
new file mode 100644
index 0000000000..431d97ec5d
--- /dev/null
+++ b/roles/openvpn/server/files/ccd/os-node01.phx2.fedoraproject.org
@@ -0,0 +1,2 @@
+# ifconfig-push actualIP PtPIP
+ifconfig-push 192.168.1.173 192.168.0.173
diff --git a/roles/openvpn/server/files/ccd/os-node02.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/os-node02.phx2.fedoraproject.org
new file mode 100644
index 0000000000..0831a99310
--- /dev/null
+++ b/roles/openvpn/server/files/ccd/os-node02.phx2.fedoraproject.org
@@ -0,0 +1,2 @@
+# ifconfig-push actualIP PtPIP
+ifconfig-push 192.168.1.174 192.168.0.174