Added support for controller_networker consolidation and opendaylight.

Addition of controller_networker.pp allows user in foreman to launch controller_networker node consolidated. Modifications to all files include support for using opendaylight as an ML2 driver. Opendaylight is installed on network or controller_networker node. ML2 is configured to point to opendaylight on control or controller_networker node. New global parameters for foreman: odl_flag = 'true' (optional, set to opendaylight to use opendaylight) odl_rest_port = '8081' (optional, defaults to 8081 if not provided. Must not be 8080 if using controller_networker.pp) odl_control_ip = '10.4.9.2' (optional for controller_networker.pp, must be provided otherwise. Private ip of ODL interface)
trystack · trozet · Jan 21, 2015 · Jan 21, 2015 · Feb 5, 2015 · Feb 11, 2015
commit c046cea0f5108d892c4fef5043d69ae85a5c8a4c
diff --git a/manifests/compute.pp b/manifests/compute.pp
@@ -1,6 +1,17 @@
 class trystack::compute {
+  if ($odl_flag != '') and str2bool($odl_flag) { 
+     $ml2_mech_drivers = ['opendaylight']
+     $this_agent = 'opendaylight'
+  }
+  else {
+    $ml2_mech_drivers = ['openvswitch','l2population'] 
+    $this_agent = 'ovs'
+  }
 
+  if $ovs_tunnel_if == '' { fail('ovs_tunnel_if is empty') }
   if $private_ip == '' { fail('private_ip is empty') }
+  if $odl_control_ip == '' { $odl_control_ip = $private_ip }
+
   if $mysql_ip == '' { fail('mysql_ip is empty') }
   if $amqp_ip == '' { fail('mysql_ip is empty') }
 
@@ -49,17 +60,20 @@
 
     cinder_backend_gluster        => $quickstack::params::cinder_backend_gluster,
 
-    agent_type                   => 'ovs',
+    agent_type                   => $this_agent,
     enable_tunneling             => true,
 
+    ml2_mechanism_drivers        => $ml2_mech_drivers,
+    odl_controller_ip            => $odl_control_ip,
+
     neutron_db_password          => $neutron_db_password,
     neutron_user_password        => $neutron_user_password,
     neutron_host                 => $private_ip,
 
     #ovs_bridge_mappings          = $quickstack::params::ovs_bridge_mappings,
     #ovs_bridge_uplinks           = $quickstack::params::ovs_bridge_uplinks,
     #ovs_vlan_ranges              = $quickstack::params::ovs_vlan_ranges,
-    ovs_tunnel_iface             => 'em1',
+    ovs_tunnel_iface             => $ovs_tunnel_if,
     ovs_tunnel_network           => '',
     ovs_l2_population            => 'True',
 

diff --git a/manifests/controller.pp b/manifests/controller.pp
@@ -1,11 +1,23 @@
 class trystack::controller {
+  ###use 8081 as a default work around swift service
+  if $odl_rest_port == '' {$odl_rest_port = '8081'}
+
+  if ($odl_flag != '') and str2bool($odl_flag) {
+     $ml2_mech_drivers = ['opendaylight']
+  }
+  else {
+    $ml2_mech_drivers = ['openvswitch','l2population']
+  }
+
 
   if $admin_email == '' { fail('admin_email is empty') }
   if $admin_password == '' { fail('admin_password is empty') }
 
   if $public_ip == '' { fail('public_ip is empty') }
   if $private_ip == '' { fail('private_ip is empty') }
 
+  if $odl_control_ip == '' { fail('odl_controL_ip is empty, should be the IP of your network node private interface') }
+
   if $mysql_ip == '' { fail('mysql_ip is empty') }
   if $mysql_root_password == '' { fail('mysql_root_password is empty') }
   if $amqp_ip == '' { fail('amqp_ip is empty') }
@@ -87,13 +99,16 @@
     horizon_cert                  => $quickstack::params::horizon_cert,
     horizon_key                   => $quickstack::params::horizon_key,
 
+    ml2_mechanism_drivers         => $ml2_mech_drivers,
     #neutron                       => true,
     neutron_metadata_proxy_secret => $neutron_metadata_shared_secret,
     neutron_db_password           => $neutron_db_password,
     neutron_user_password         => $neutron_user_password,
 
     nova_db_password              => $nova_db_password,
     nova_user_password            => $nova_user_password,
+    odl_controller_ip             => $odl_control_ip,
+    odl_controller_port           => $odl_rest_port,
 
     swift_shared_secret           => $swift_shared_secret,
     swift_admin_password          => $swift_admin_password,

diff --git a/manifests/controller_networker.pp b/manifests/controller_networker.pp
@@ -0,0 +1,135 @@
+class trystack::controller_networker {
+  ###use 8081 as a default work around swift service
+  if $odl_rest_port == '' {$odl_rest_port = '8081'}
+
+  if ($odl_flag != '') and str2bool($odl_flag) { 
+     $ml2_mech_drivers = ['opendaylight']
+     $this_agent = 'opendaylight'
+     class {"opendaylight":
+       odl_rest_port => $odl_rest_port,
+       extra_features => ['odl-base-all', 'odl-aaa-authn', 'odl-restconf', 'odl-nsf-all', 'odl-adsal-northbound', 'odl-mdsal-apidocs', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound', 'odl-dlux-core'],
+     }
+  }
+  else {
+    $ml2_mech_drivers = ['openvswitch','l2population'] 
+    $this_agent = 'ovs'
+  }
+  if $ovs_tunnel_if == '' { fail('ovs_tunnel_if is empty') }
+  if $admin_email == '' { fail('admin_email is empty') }
+  if $admin_password == '' { fail('admin_password is empty') }
+
+  if $public_ip == '' { fail('public_ip is empty') }
+  if $private_ip == '' { fail('private_ip is empty') }
+
+  if $odl_control_ip == '' { $odl_control_ip = $private_ip }
+
+  if $mysql_ip == '' { fail('mysql_ip is empty') }
+  if $mysql_root_password == '' { fail('mysql_root_password is empty') }
+  if $amqp_ip == '' { fail('amqp_ip is empty') }
+
+  if $memcache_ip == '' { fail('memcache_ip is empty') }
+  if $neutron_ip == '' { fail('neutron_ip is empty') }
+
+  if $keystone_admin_token == '' { fail('keystone_admin_token is empty') }
+  if $keystone_db_password == '' { fail('keystone_db_password is empty') }
+
+  if $horizon_secret_key == '' { fail('horizon_secret_key is empty') }
+  #if $trystack_db_password == '' { fail('trystack_db_password is empty') }
+
+  if $nova_user_password == '' { fail('nova_user_password is empty') }
+  if $nova_db_password == '' { fail('nova_db_password is empty') }
+
+  if $cinder_user_password == '' { fail('cinder_user_password is empty') }
+  if $cinder_db_password == '' { fail('cinder_db_password is empty') }
+
+  if $glance_user_password == '' { fail('glance_user_password is empty') }
+  if $glance_db_password == '' { fail('glance_db_password is empty') }
+
+  if $neutron_user_password == '' { fail('neutron_user_password is empty') }
+  if $neutron_db_password == '' { fail('neutron_db_password is empty') }
+  if $neutron_metadata_shared_secret == '' { fail('neutron_metadata_shared_secret is empty') }
+
+  if $ceilometer_user_password == '' { fail('ceilometer_user_password is empty') }
+  if $ceilometer_metering_secret == '' { fail('ceilometer_user_password is empty') }
+
+  if $heat_user_password == '' { fail('heat_user_password is empty') }
+  if $heat_db_password == '' { fail('heat_db_password is empty') }
+  if $heat_auth_encrypt_key == '' { fail('heat_auth_encrypt_key is empty') }
+
+  if $swift_user_password == '' { fail('swift_user_password is empty') }
+  if $swift_shared_secret == '' { fail('swift_shared_secret is empty') }
+  if $swift_admin_password == '' { fail('swift_admin_password is empty') }
+
+  class { "quickstack::neutron::controller_networker":
+    admin_email                   => $admin_email,
+    admin_password                => $admin_password,
+    agent_type                    => $this_agent,
+    enable_tunneling              => true,
+    ovs_tunnel_iface              => $ovs_tunnel_if,
+    ovs_tunnel_network            => '',
+    ovs_tunnel_types              => ['vxlan'],
+    ovs_l2_population             => 'True',
+    external_network_bridge       => 'br-ex',
+    tenant_network_type           => 'vxlan',
+    tunnel_id_ranges              => '1:1000',
+    controller_admin_host         => $private_ip,
+    controller_priv_host          => $private_ip,
+    controller_pub_host           => $public_ip,
+    ssl                           => false,
+    #support_profile               => $quickstack::params::support_profile,
+    #freeipa                       => $quickstack::params::freeipa,
+
+    mysql_host                    => $mysql_ip,
+    mysql_root_password           => $mysql_root_password,
+    #amqp_provider                 => $amqp_provider,
+    amqp_host                     => $amqp_ip,
+    amqp_username                 => 'guest',
+    amqp_password                 => 'guest',
+    #amqp_nssdb_password           => $quickstack::params::amqp_nssdb_password,
+
+    keystone_admin_token          => $keystone_admin_token,
+    keystone_db_password          => $keystone_db_password,
+
+    ceilometer_metering_secret    => $ceilometer_metering_secret,
+    ceilometer_user_password      => $ceilometer_user_password,
+
+    cinder_backend_gluster        => $quickstack::params::cinder_backend_gluster,
+    cinder_backend_gluster_name   => $quickstack::params::cinder_backend_gluster_name,
+    cinder_gluster_shares         => $quickstack::params::cinder_gluster_shares,
+    cinder_user_password          => $cinder_user_password,
+    cinder_db_password            => $cinder_db_password,
+
+    glance_db_password            => $glance_db_password,
+    glance_user_password          => $glance_user_password,
+
+    heat_cfn                      => true,
+    heat_cloudwatch               => true,
+    heat_db_password              => $heat_db_password,
+    heat_user_password            => $heat_user_password,
+    heat_auth_encrypt_key         => $heat_auth_encrypt_key,
+
+    horizon_secret_key            => $horizon_secret_key,
+    horizon_ca                    => $quickstack::params::horizon_ca,
+    horizon_cert                  => $quickstack::params::horizon_cert,
+    horizon_key                   => $quickstack::params::horizon_key,
+
+    ml2_mechanism_drivers         => $ml2_mech_drivers,
+
+    #neutron                       => true,
+    neutron_metadata_proxy_secret => $neutron_metadata_shared_secret,
+    neutron_db_password           => $neutron_db_password,
+    neutron_user_password         => $neutron_user_password,
+
+    nova_db_password              => $nova_db_password,
+    nova_user_password            => $nova_user_password,
+
+    odl_controller_ip             => $odl_control_ip,
+    odl_controller_port           => $odl_rest_port,
+    swift_shared_secret           => $swift_shared_secret,
+    swift_admin_password          => $swift_admin_password,
+    swift_ringserver_ip           => '192.168.203.1',
+    swift_storage_ips             => ["192.168.203.2","192.168.203.3","192.168.203.4"],
+    swift_storage_device          => 'device1',
+  }
+
+}
diff --git a/manifests/network.pp b/manifests/network.pp
@@ -1,6 +1,27 @@
 class trystack::network {
+  ###use 8081 as a default work around swift service
+  if $odl_rest_port == '' {$odl_rest_port = '8081'}
 
+  if ($odl_flag != '') and str2bool($odl_flag) {
+     $ml2_mech_drivers = ['opendaylight']
+     $this_agent = 'opendaylight'
+     class {"opendaylight":
+       odl_rest_port => $odl_rest_port,
+       extra_features => ['odl-base-all', 'odl-aaa-authn', 'odl-restconf', 'odl-nsf-all', 'odl-adsal-northbound', 'odl-mdsal-apidocs', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound', 'odl-dlux-core'],
+     }
+  }
+  else {
+    $ml2_mech_drivers = ['openvswitch','l2population']
+    $this_agent = 'ovs'
+  }
+
+
+
+  if $ovs_tunnel_if == '' { fail('ovs_tunnel_if is empty') }
   if $private_ip == '' { fail('private_ip is empty') }
+
+  if $odl_control_ip == '' { fail('odl_controL_ip is empty, should be the IP of your network node private interface') }
+
   if $mysql_ip == '' { fail('mysql_ip is empty') }
   if $amqp_ip == '' { fail('amqp_ip is empty') }
 
@@ -12,6 +33,8 @@
   if $neutron_metadata_shared_secret == '' { fail('neutron_metadata_shared_secret is empty') }
 
   class { "quickstack::neutron::networker":
+    agent_type                    => $this_agent,
+    ml2_mechanism_drivers         => $ml2_mech_drivers,
     neutron_metadata_proxy_secret => $neutron_metadata_shared_secret,
     neutron_db_password           => $neutron_db_password,
     neutron_user_password         => $neutron_user_password,
@@ -22,7 +45,7 @@
 
     agent_type                    => 'ovs',
     enable_tunneling              => true,
-    ovs_tunnel_iface              => 'em1',
+    ovs_tunnel_iface              => $ovs_tunnel_if,
     ovs_tunnel_network            => '',
     ovs_l2_population             => 'True',
     ovs_tunnel_types              => ['vxlan'],
@@ -34,5 +57,8 @@
     amqp_host                     => $amqp_ip,
     amqp_username                 => 'guest',
     amqp_password                 => 'guest',
+
+    ml2_mechanism_drivers        => $ml2_mech_drivers,
+    odl_controller_ip            => $odl_control_ip,
   }
 }