diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..daedd39
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.tox
+.build
+*.pyc
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e06d208
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..d61af4e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,46 @@
+fuel-plugin-network-node
+============
+
+Fuel plugin to seperate the network agent on the their own nodes. 
+
+Summary
+-------
+
+The plugin will disable the L3, metatdata and DHCP agents on the openstack controllers, 
+and install and configure the agents on a new network-node role that is created.
+
+Usage
+-----
+
+The plugin must be installed and turned on prior to adding the controllers to the fuel
+environment to ensure that the deployment task are created correctly.
+
+Building the Plugin
+-------------------
+1. Clone the fuel-plugin repo from:
+
+    ``git clone https://github.com/p5ntangle/fuel-plugin-network-node``
+
+2. Install the Fuel Plugin Builder:
+
+    ``pip install fuel-plugin-builder``
+
+3. Build Network Node Fuel plugin:
+
+   ``fpb --build fuel-plugin-network-node/``
+
+4. The network-plugin-<x.x.x>.rpm plugin package will be created in the plugin folder
+   (fuel-plugin-network/).
+
+5. Move this file to the Fuel Master node with secure copy (scp):
+
+   ``scp network-node-<x.x.x>.rpm root@:<the_Fuel_Master_node_IP address>:/tmp``
+   ``cd /tmp``
+
+6. Install the Network Node plugin:
+
+   ``fuel plugins --install network-plugin-<x.x.x>.rpm``
+
+6. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
+
+
diff --git a/deployment_scripts/network_hiera_override.pp b/deployment_scripts/network_hiera_override.pp
new file mode 100644
index 0000000..477481e
--- /dev/null
+++ b/deployment_scripts/network_hiera_override.pp
@@ -0,0 +1,105 @@
+notice('MODULAR: network-node/network_hiera_override.pp')
+
+$network_node_plugin = hiera('network-node', undef)
+$hiera_dir = '/etc/hiera/override'
+$plugin_name = 'network-node'
+$plugin_yaml = "${plugin_name}.yaml"
+
+if $network_node_plugin {
+  $network_metadata = hiera_hash('network_metadata')
+  $network_roles = ['primary-network-node', 'network-node']
+  $network_nodes = get_nodes_hash_by_roles($network_metadata, $network_roles)
+  $management_vip = $network_metadata['vips']['management']['ipaddr']
+  $public_vip = $network_metadata['vips']['public']['ipaddr']
+
+  $quantum_hash = hiera_hash('quantum_settings')
+
+  case hiera_array('role', 'none') {
+    /network-node/: {
+
+      if hiera('role', 'none') == 'primary-network-node' {
+        $primary_controller = true
+      } else {
+        $primary_controller = false
+      }
+      $use_neutron = true
+      $corosync_roles = $network_roles
+      $deploy_vrouter = false
+      $haproxy_nodes = false
+      $corosync_nodes = $network_nodes
+      $new_quantum_settings_hash = {
+        'neutron_agents' => ['l3', 'metadata', 'dhcp'],
+        'neutron_server_enable' => false,
+        'conf_nova' => false
+      }
+      $neutron_settings = merge($quantum_hash, $new_quantum_settings_hash)
+    }
+    /controller/: {
+      $use_neutron = true
+      $new_quantum_settings_hash = {
+        'neutron_agents' => [''],
+      }
+      $neutron_settings = merge($quantum_hash, $new_quantum_settings_hash)
+
+      if hiera('role', 'none') =~ /^primary/ {
+        $primary_controller = 'true'
+      } else {
+        $primary_controller = 'false'
+      }
+    }
+    default: {
+      $use_neutron = true
+    }
+  }
+
+###################
+  $calculated_content = inline_template('
+<% if @corosync_nodes -%>
+<% require "yaml" -%>
+corosync_nodes:
+<%= YAML.dump(@corosync_nodes).sub(/--- *$/,"") %>
+<% end -%>
+<% if @corosync_roles -%>
+corosync_roles:
+<%
+@corosync_roles.each do |crole|
+%>  - <%= crole %>
+<% end -%>
+<% end -%>
+<% if @neutron_settings -%>
+<% require "yaml" -%>
+quantum_settings:
+<%= YAML.dump(@neutron_settings).sub(/--- *$/,"") %>
+<% end -%>
+deploy_vrouter: <%= @deploy_vrouter %>
+primary_controller: <%= @primary_controller %>
+management_vip: <%= @management_vip %>
+database_vip:  <%= @management_vip %>
+service_endpoint: <%= @management_vip %>
+public_vip: <%= @public_vip %>
+use_neutron: <%= @use_neutron %>
+  ')
+
+###################
+
+  file {'/etc/hiera/override':
+    ensure  => directory,
+  } ->
+  file { '/etc/hiera/override/common.yaml':
+    ensure  => file,
+    content => "${calculated_content}\n",
+  }
+
+  package {'ruby-deep-merge':
+    ensure  => 'installed',
+  }
+
+  file_line {'hiera.yaml':
+    path  => '/etc/hiera.yaml',
+      line  => "  - override/${plugin_name}",
+      after => '  - override/module/%{calling_module}',
+  }
+
+}
+
+
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
new file mode 100644
index 0000000..a662eaa
--- /dev/null
+++ b/deployment_tasks.yaml
@@ -0,0 +1,47 @@
+####
+
+- id: primary-network-node
+  type: group
+  role: [primary-network-node]
+  requires: [deploy_start, primary-controller, controller]
+  required_for: [deploy_end]
+  tasks: [fuel_pkgs, hiera, globals, tools, logging, netconfig,
+    hosts, firewall, deploy_start, cluster, cluster-haproxy,
+    openstack-haproxy-stats, network-node-task]
+  parameters:
+    strategy:
+      type: one_by_one
+
+- id: network-node
+  type: group
+  role: [network-node]
+  requires: [deploy_start, primary-network-node]
+  required_for: [deploy_end]
+  tasks: [fuel_pkgs, hiera, globals, tools, logging, netconfig,
+    hosts, firewall, deploy_start, cluster, cluster-haproxy,
+    openstack-haproxy-stats, network-node-task]
+  parameters:
+    strategy:
+      type: parallel
+
+### Tasks
+- id: network-hiera-override
+  type: puppet
+  groups: [primary-controller, controller, primary-network-node, network-node]
+  requires: [globals]
+  required_for: [logging]
+  parameters:
+    puppet_manifest: "network_hiera_override.pp"
+    puppet_modules: "/etc/puppet/modules"
+    timeout: 120
+
+- id: network-node-task
+  type: puppet
+  groups: [primary-network-node, network-node]
+  requires: [cluster, firewall, network-hiera-override]
+  required_for: [deploy_end]
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/openstack-network/openstack-network-controller.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 3600
+
diff --git a/environment_config.yaml b/environment_config.yaml
new file mode 100644
index 0000000..d3d7d15
--- /dev/null
+++ b/environment_config.yaml
@@ -0,0 +1,4 @@
+attributes:
+  metadata:
+    label: "Seperate Network nodes"
+    weight: 90
diff --git a/metadata.yaml b/metadata.yaml
new file mode 100644
index 0000000..1c0f8b8
--- /dev/null
+++ b/metadata.yaml
@@ -0,0 +1,35 @@
+# Plugin name
+name: network-node
+# Human-readable name for your plugin
+title: Seperate network agents from controllers
+# Plugin version
+version: '1.0.2'
+# Description
+description: Creates a seperate role for Neutron Agents
+# Required fuel version
+fuel_version: ['7.0']
+# Specify license of your plugin
+licenses: ['Apache License Version 2.0']
+# Specify author or company name
+authors: ['Shaun OMeara','Mirantis']
+# A link to the plugin's page
+homepage: 'https://github.com/stackforge/fuel-plugins'
+# Specify a group which your plugin implements, possible options:
+# network, storage, storage::cinder, storage::glance, hypervisor
+groups: [network]
+
+# The plugin is compatible with releases in the list
+releases:
+  - os: ubuntu
+    version: 2015.1.0-7.0
+    mode: ['ha']
+    deployment_scripts_path: deployment_scripts/
+    repository_path: repositories/ubuntu
+  - os: ubuntu
+    version: 2015.1.0-8.0
+    mode: ['ha']
+    deployment_scripts_path: deployment_scripts/
+    repository_path: repositories/ubuntu
+
+# Version of plugin package
+package_version: '3.0.0'
diff --git a/network_roles.yaml b/network_roles.yaml
new file mode 100644
index 0000000..a329bdb
--- /dev/null
+++ b/network_roles.yaml
@@ -0,0 +1,10 @@
+- id: "neutron_agents"
+  default_mapping: "management"
+  properties:
+    subnet: true
+    gateway: false
+    vip:
+      - name: "netagentvip"
+        alias: "agent_vip"
+        namespace: "haproxy"
+        node_roles: ["primary-networ-controller", "network-controller"]
diff --git a/node_roles.yaml b/node_roles.yaml
new file mode 100644
index 0000000..a7421b8
--- /dev/null
+++ b/node_roles.yaml
@@ -0,0 +1,14 @@
+network-node:
+  name: "Network Node"
+  description: "Role to create a seperate Network Node"
+  update_required:
+    - controller
+    - network-node
+  has_primary: True
+  public_ip_required: True
+  weight: 1000
+  conflicts:
+    - controller
+    - compute
+  limits:
+    min: 1
diff --git a/pre_build_hook b/pre_build_hook
new file mode 100755
index 0000000..dc05e98
--- /dev/null
+++ b/pre_build_hook
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Add here any the actions which are required before plugin build
+# like packages building, packages downloading from mirrors and so on.
+# The script should return 0 if there were no errors.
diff --git a/repositories/centos/.gitkeep b/repositories/centos/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/repositories/ubuntu/.gitkeep b/repositories/ubuntu/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/volumes.yaml b/volumes.yaml
new file mode 100644
index 0000000..59426d7
--- /dev/null
+++ b/volumes.yaml
@@ -0,0 +1,7 @@
+volumes_roles_mapping:
+  # Default role mapping
+  fuel-plugin-network-node:
+    - {allocate_size: "min", id: "os"}
+
+# Set here new volumes for your role
+volumes: []