Merge branch 'dev_foreman_network' into dev_foreman

manifests/profile/neutron/router.pp

 #Multiple external networks supported
 class iaas::profile::neutron::router (
-  $public_interface = hiera('iaas::public_interface', undef),
-  $data_interface = hiera('iaas::data_interface', undef),
-  $public_gateway = hiera('iaas::public_gateway', undef),
+  $public_interface = $iaas::params::public_interface,
+  $data_interface = $iaas::params::admin_interface,
+  $public_gateway = $iaas::params::public_gateway,
 
-  $external_device1 = undef,
-  $external_network1 = hiera('iaas::profile::neutron::external_network1', undef),
-  $external_gateway1 = hiera('iaas::profile::neutron::external_gateway1', undef),
+  $external_device1 = $iaas::params::external_device1,
+  $external_network1 = undef,
+  $external_gateway1 = undef,
 
-  $external_device2 = undef,
-  $external_network2 = hiera('iaas::profile::neutron::external_network2', undef),
-  $external_gateway2 = hiera('iaas::profile::neutron::external_gateway2', undef),
+  $external_device2 = $iaas::params::external_device2,
+  $external_network2 = undef,
+  $external_gateway2 = undef,
 
-  $neutron_password = hiera('iaas::profile::neutron::password', undef),
-  $neutron_secret = hiera('iaas::profile::neutron::secret', undef),
+  $neutron_password = $iaas::params::neutron_password,
+  $neutron_secret = $iaas::params::neutron_secret,
 
-  $region = hiera('iaas::region', undef),
+  $region = iaas::params::region,
 
 #VIP1
-  $endpoint_main = hiera('iaas::main_address', undef),
+  $endpoint_main = $iaas::params::main_address,
 #VIP2
-  $endpoint_admin = hiera('iaas::admin_address', undef),
+  $endpoint_admin = $iaas::params::admin_address,
 
-  $mtu = hiera('iaas::profile::neutron::router::mtu', 1438),
+  $mtu = '1438',
 
 ) {
 

manifests/role/network.pp

 class iaas::role::network (
+
+##Network1 - external
+$neutron_external_network1 = '10.10.98.0/24',
+$neutron_external_gateway1 = '10.10.98.1',
+##Network2 - external
+$neutron_external_network2 = '10.10.99.0/24',
+$neutron_external_gateway2 = '10.10.99.1',
+
+$mtu = '1438',
+
 ){
 # Base
   class { 'iaas::profile::base': } ->
-  class { 'iaas::profile::neutron::router': } 
+  class { 'iaas::profile::neutron::router': 
+        mtu => $mtu,
+        external_network1 => $neutron_external_network1, 
+        external_gateway1 => $neutron_external_gateway1, 
+        external_network2 => $neutron_external_network2,
+        external_gateway2 => $neutron_external_gateway2, 
+  } 
 }