X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_controller.pp;h=96302f2e20c235ce87bfa6a9055826e53e5e02c6;hb=618d14d7cf7f9a6499a7bf75ef2c01337d53715c;hp=8332e56b743fb969c626554ff61f221351d14c08;hpb=03b917710e5ff4f3f2f650688c750ee9628751f3;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 8332e56b..96302f2e 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -84,7 +84,8 @@ if hiera('step') >= 2 {
         'max_connections' => hiera('mysql_max_connections'),
         'open_files_limit' => '-1',
       },
-    }
+    },
+    remove_default_accounts => true,
   }
 
   # FIXME: this should only occur on the bootstrap host (ditto for db syncs)
@@ -158,6 +159,8 @@ if hiera('step') >= 2 {
 if hiera('step') >= 3 {
 
   include ::keystone
+  include ::keystone::roles::admin
+  include ::keystone::endpoint
 
   #TODO: need a cleanup-keystone-tokens.sh solution here
   keystone_config {
@@ -245,6 +248,20 @@ if hiera('step') >= 3 {
     bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
     tunnel_types => split(hiera('neutron_tunnel_types'), ','),
   }
+  if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
+    include neutron::plugins::ml2::cisco::nexus1000v
+
+    class { 'neutron::agents::n1kv_vem':
+      n1kv_source          => hiera('n1kv_vem_source', undef),
+      n1kv_version         => hiera('n1kv_vem_version', undef),
+    }
+
+    class { 'n1k_vsm':
+      n1kv_source       => hiera('n1kv_vsm_source', undef),
+      n1kv_version      => hiera('n1kv_vsm_version', undef),
+      pacemaker_control => false,
+    }
+  }
 
   if 'cisco_ucsm' in hiera('neutron_mechanism_drivers') {
     include ::neutron::plugins::ml2::cisco::ucsm
@@ -440,10 +457,15 @@ if hiera('step') >= 3 {
   include ::heat::engine
 
   # Horizon
-  $vhost_params = { add_listen => false }
+  if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
+    $_profile_support = 'cisco'
+  } else {
+    $_profile_support = 'None'
+  }
+  $neutron_options   = {'profile_support' => $_profile_support }
   class { 'horizon':
     cache_server_ip    => hiera('memcache_node_ips', '127.0.0.1'),
-    vhost_extra_params => $vhost_params,
+    neutron_options    => $neutron_options,
   }
 
   $snmpd_user = hiera('snmpd_readonly_user_name')
@@ -462,6 +484,15 @@ if hiera('step') >= 3 {
 
 if hiera('step') >= 4 {
   include ::keystone::cron::token_flush
+
+  include ::ceilometer::keystone::auth
+  include ::cinder::keystone::auth
+  include ::glance::keystone::auth
+  include ::heat::keystone::auth
+  include ::neutron::keystone::auth
+  include ::nova::keystone::auth
+  include ::swift::keystone::auth
+
 } #END STEP 4
 
 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])