Network separation from controller(s)

examples/manifests/site.pp

@@ -259,6 +259,11 @@ $mysql_grants = {
 #}
 
 
+##NETWORK NODE(s)
+#node '<NETWORK_HOSTNAME>' {
+# include 'iaas::role::network'
+
+
 ##COMPUTE NODE(s)
 #node '<COMPUTE_HOSTNAME>' {
 # include 'iaas::role::compute'
@@ -283,3 +288,4 @@ $mysql_grants = {
 # }
 #
 #}
+

manifests/profile/neutron/router.pp

@@ -27,6 +27,21 @@ class iaas::profile::neutron::router (
 
   include iaas::profile::neutron::common
 
+  class { '::neutron::server':
+    auth_host => $endpoint,
+    auth_uri => "http://${endpoint}:5000/v2.0",
+##identity_uri set to be added in next OS release
+#    identity_uri => "http://${endpoint}:35357",
+    auth_password => $neutron_password,
+    database_connection => $iaas::resources::connectors::neutron,
+    package_ensure => 'absent',
+    enabled => false,
+    sync_db => false,
+    mysql_module => '2.3',
+    database_idle_timeout => 3600,
+    l3_ha => false,
+  }
+
   class { '::neutron::agents::l3':
     external_network_bridge => 'br-ex',
     use_namespaces => true,
@@ -148,7 +163,4 @@ notify { "OperatingSystem: $::operatingsystem ; OperatingSystemRelease: $::opera
 
   }
 
-##Public/private network configuration for tenant - added
-class { '::iaas::setup::sharednetwork': }
-
 }

manifests/role/controller.pp

@@ -11,10 +11,10 @@ $zookeeper_id = undef,
   class { 'iaas::profile::cinder': } ->
   class { 'iaas::profile::nova::controller': } ->
   class { 'iaas::profile::neutron::server': } ->
-  class { 'iaas::profile::neutron::router': } -> 
   class { 'iaas::profile::ceilometer::controller': 
     zookeeper_id => $zookeeper_id
   } ->
   class { 'iaas::profile::heat': } ->
-  class { 'iaas::profile::horizon': }
+  class { 'iaas::profile::horizon': } ->
+  class { 'iaas::setup::sharednetwork': }
 }

manifests/role/network.pp

+class iaas::role::network (
+){
+# Base
+  class { 'iaas::profile::base': } ->
+  class { 'iaas::profile::neutron::router': } 
+}