Composable Timezone service - ObjectStorage

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_compute.pp

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index cf20c0c..af04d65 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -20,12 +20,6 @@ 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
-
 if hiera('step') >= 4 {
 
   file { ['/etc/libvirt/qemu/networks/autostart/default.xml',
@@ -51,10 +45,6 @@ if hiera('step') >= 4 {
     ensure => present,
   }
 
-  include ::nova
-  include ::nova::config
-  include ::nova::compute
-
   $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 {
@@ -70,7 +60,7 @@ if hiera('step') >= 4 {
     include ::ceph::profile::client
 
     $client_keys = hiera('ceph::profile::params::client_keys')
-    $client_user = join(['client.', hiera('ceph_client_user_name')])
+    $client_user = join(['client.', hiera('tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name')])
     class { '::nova::compute::rbd':
       libvirt_rbd_secret_key => $client_keys[$client_user]['secret'],
     }
@@ -108,7 +98,6 @@ if hiera('step') >= 4 {
   nova_config {
     'DEFAULT/my_ip': value => $ipaddress;
     'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
-    'DEFAULT/host': value => $fqdn;
   }
 
   if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
@@ -198,26 +187,13 @@ if hiera('step') >= 4 {
     }
   }
 
-  neutron_config {
-    'DEFAULT/host': value => $fqdn;
-  }
-
   include ::ceilometer
   include ::ceilometer::config
   include ::ceilometer::agent::compute
   include ::ceilometer::agent::auth
 
-  $snmpd_user = hiera('snmpd_readonly_user_name')
-  snmp::snmpv3_user { $snmpd_user:
-    authtype => 'MD5',
-    authpass => hiera('snmpd_readonly_user_password'),
-  }
-  class { '::snmp':
-    agentaddress => ['udp:161','udp6:[::1]:161'],
-    snmpd_config => [ join(['createUser ', hiera('snmpd_readonly_user_name'), ' MD5 "', hiera('snmpd_readonly_user_password'), '"']), join(['rouser ', hiera('snmpd_readonly_user_name')]), 'proc  cron', 'includeAllDisks  10%', 'master agentx', 'trapsink localhost public', 'iquerySecName internalUser', 'rouser internalUser', 'defaultMonitors yes', 'linkUpDownNotifications yes' ],
-  }
-
   hiera_include('compute_classes')
-  package_manifest{ '/var/lib/tripleo/installed-packages/overcloud_compute': ensure => present }
-
 }
+
+$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_compute', hiera('step')])
+package_manifest{$package_manifest_name: ensure => present}