diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 5efeee8..0ac6e50 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -34,3 +34,21 @@
     puppet_manifest: puppet/manifests/nsxv-config.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 300
+- id: configure_default_route_cinder_vmware
+  type: puppet
+  groups: ['cinder-vmware']
+  requires: [openstack-cinder]
+  required_for: [top-role-cinder-vmware]
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/netconfig/configure_default_route.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 300
+- id: configure_default_route_compute_vmware
+  type: puppet
+  groups: ['compute-vmware']
+  requires: [top-role-compute]
+  required_for: [top-role-compute-vmware]
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/netconfig/configure_default_route.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 300
diff --git a/doc/source/environment.rst b/doc/source/environment.rst
index cd4e42d..b3e2d56 100644
--- a/doc/source/environment.rst
+++ b/doc/source/environment.rst
@@ -52,17 +52,3 @@ for GRE tunneling which does not have an effect with NSXv.
 
 .. image:: /image/neutron-network-settings.png
    :scale: 70 %
-
-Public network assignment
--------------------------
-
-If you are going to use *Cinder proxy to VMware datastore* or *Compute VMware*
-roles in your environment then you have to assign public IP addresses to all
-nodes, because all communication between OpenStack services (Cinder and Nova in
-this case) and vCenter happens via Public network.
-
-You can achieve this by enabling following option (*Settings -> Public network
-assignment -> Assign public network to all nodes*):
-
-.. image:: /image/public-network-assignment.png
-   :scale: 70 %
diff --git a/doc/source/image/public-network-assignment.png b/doc/source/image/public-network-assignment.png
deleted file mode 100644
index 516514f..0000000
Binary files a/doc/source/image/public-network-assignment.png and /dev/null differ
diff --git a/post_install.sh b/post_install.sh
index c948294..a72b7d2 100755
--- a/post_install.sh
+++ b/post_install.sh
@@ -37,13 +37,6 @@ def clear_restriction():
         except:
             pass
 
-        release.roles_metadata = deepcopy(release.roles_metadata)
-
-        try:
-            release.roles_metadata['compute-vmware']['public_ip_required'] = True
-        except:
-            pass
-
     db().commit()
     return 0