X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_compute.pp;h=0f1318c32ff74f4c13af8c81671a897d42b5b745;hb=9e473e4b54197811ede59b07bfb3d0e79475e2e1;hp=cd41cc7962d61cf4d62b904597e7d2f6889facf7;hpb=17c0f43894ff1ff4d7d8392f4ee1cc129431453c;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index cd41cc79..0f1318c3 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -14,13 +14,18 @@
 # under the License.
 
 include ::tripleo::packages
+include ::tripleo::firewall
 
+create_resources(kmod::load, hiera('kernel_modules'), {})
 create_resources(sysctl::value, hiera('sysctl_settings'), {})
+Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
 
 if count(hiera('ntp::servers')) > 0 {
   include ::ntp
 }
 
+include ::timezone
+
 file { ['/etc/libvirt/qemu/networks/autostart/default.xml',
         '/etc/libvirt/qemu/networks/default.xml']:
   ensure => absent,
@@ -34,6 +39,16 @@ exec { 'libvirt-default-net-destroy':
   before  => Service['libvirt'],
 }
 
+# When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique
+exec { 'reset-iscsi-initiator-name':
+  command => '/bin/echo InitiatorName=$(/usr/sbin/iscsi-iname) > /etc/iscsi/initiatorname.iscsi',
+  onlyif  => '/usr/bin/test ! -f /etc/iscsi/.initiator_reset',
+}->
+
+file { '/etc/iscsi/.initiator_reset':
+  ensure => present,
+}
+
 include ::nova
 include ::nova::config
 include ::nova::compute
@@ -46,6 +61,7 @@ nova_config {
 $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false)
 $rbd_persistent_storage = hiera('rbd_persistent_storage', false)
 if $rbd_ephemeral_storage or $rbd_persistent_storage {
+  include ::ceph::conf
   include ::ceph::profile::client
 
   $client_keys = hiera('ceph::profile::params::client_keys')
@@ -67,23 +83,57 @@ if hiera('cinder_enable_nfs_backend', false) {
 }
 
 include ::nova::compute::libvirt
+if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
+  file {'/etc/libvirt/qemu.conf':
+    ensure  => present,
+    content => hiera('midonet_libvirt_qemu_data')
+  }
+}
 include ::nova::network::neutron
 include ::neutron
-
-class { '::neutron::plugins::ml2':
-  flat_networks        => split(hiera('neutron_flat_networks'), ','),
-  tenant_network_types => [hiera('neutron_tenant_network_type')],
+include ::neutron::config
+
+# If the value of core plugin is set to 'nuage',
+# include nuage agent,
+# If the value of core plugin is set to 'midonet',
+# include midonet agent,
+# else use the default value of 'ml2'
+if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' {
+  include ::nuage::vrs
+  include ::nova::compute::neutron
+
+  class { '::nuage::metadataagent':
+    nova_os_tenant_name => hiera('nova::api::admin_tenant_name'),
+    nova_os_password    => hiera('nova_password'),
+    nova_metadata_ip    => hiera('nova_metadata_node_ips'),
+    nova_auth_ip        => hiera('keystone_public_api_virtual_ip'),
+  }
 }
+elsif hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
+
+  # TODO(devvesa) provide non-controller ips for these services
+  $zookeeper_node_ips = hiera('neutron_api_node_ips')
+  $cassandra_node_ips = hiera('neutron_api_node_ips')
 
-class { '::neutron::agents::ml2::ovs':
-  bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
-  tunnel_types    => split(hiera('neutron_tunnel_types'), ','),
+  class {'::tripleo::network::midonet::agent':
+    zookeeper_servers => $zookeeper_node_ips,
+    cassandra_seeds   => $cassandra_node_ips
+  }
 }
+else {
+
+  include ::neutron::plugins::ml2
+  include ::neutron::agents::ml2::ovs
+
+  if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
+    class { '::neutron::agents::n1kv_vem':
+      n1kv_source  => hiera('n1kv_vem_source', undef),
+      n1kv_version => hiera('n1kv_vem_version', undef),
+    }
+  }
 
-if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
-  class { '::neutron::agents::n1kv_vem':
-    n1kv_source  => hiera('n1kv_vem_source', undef),
-    n1kv_version => hiera('n1kv_vem_version', undef),
+  if 'bsn_ml2' in hiera('neutron::plugins::ml2::mechanism_drivers') {
+    include ::neutron::agents::bigswitch
   }
 }