Merge pull request #143 from rwaffen/fix_things

Fix things

Author: rwaffen

Gemfile

@@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
   gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
+  gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false

Vagrantfile

@@ -26,13 +26,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "centos" do |centos|
     centos.vm.box = "centos65_64"
     centos.vm.box_url = 'http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-puppet.box'
-    centos.vm.provision "shell", inline: '/usr/bin/yum -y install https://yum.puppetlabs.com/el/6.5/products/x86_64/puppetlabs-release-6-10.noarch.rpm'
     centos.vm.provision "shell", inline: '/usr/bin/yum -y install puppet epel-release'
     centos.vm.provision "shell", inline: 'puppet module install puppetlabs-stdlib'
     centos.vm.provision "puppet" do |puppet|
       puppet.manifests_path = "manifests"
       puppet.manifest_file  = "init.pp"
-      puppet.options = ['--verbose', "-e 'class { one: oned => true, sunstone => true, }'"]
+      puppet.options = [
+          '--verbose',
+          "-e 'class { one: oned => true, node => false, sunstone => true, }'"
+      ]
     end
   end
 end

manifests/compute_node/config.pp

@@ -114,19 +114,6 @@
     mode   => '0771',
   }
 
-  file { '/var/lib/one/bin':
-    ensure => directory,
-    owner  => 'oneadmin',
-    group  => 'oneadmin',
-    mode   => '0755',
-  }
-
-  file { '/var/lib/one/etc':
-    ensure => directory,
-    owner  => 'oneadmin',
-    group  => 'oneadmin',
-  }
-
   file { ['/var/lib/one/etc/kickstart.d',
           '/var/lib/one/etc/preseed.d']:
     ensure  => directory,

manifests/config.pp

@@ -39,4 +39,17 @@
   file { '/var/lib/one/.ssh/config':
     source => 'puppet:///modules/one/ssh_one_config',
   }
+
+  file { '/var/lib/one/bin':
+    ensure => directory,
+    owner  => 'oneadmin',
+    group  => 'oneadmin',
+    mode   => '0755',
+  }
+
+  file { '/var/lib/one/etc':
+    ensure => directory,
+    owner  => 'oneadmin',
+    group  => 'oneadmin',
+  }
 }

manifests/init.pp

@@ -120,6 +120,15 @@
             $debug_level        = '0',
             ) {
   include one::params
+  include one::install
+  include one::config
+  include one::service
+
+  Class['one::params'] ->
+  Class['one::install']->
+  Class['one::config']->
+  Class['one::service']
+
   if ($oned) {
     if ( member(['kvm','xen3','xen4','vmware','ec2', 'qemu'], $vtype) ) {
       if ( member(['802.1Q','ebtables','firewall','ovswitch'], $ntype) ) {
@@ -143,7 +152,4 @@
   if($onegate) {
     class {'one::oned::onegate': }
   }
-  include one::install
-  include one::config
-  include one::service
 }

manifests/oned.pp

@@ -37,13 +37,15 @@
   include one::params
   include one::install
   include one::service
+  include one::config
   include one::oned::install
   include one::oned::config
   include one::oned::service
 
   Class['one::prerequisites'] ->
   Class['one::params'] ->
   Class['one::install'] ->
+  Class['one::config'] ->
   Class['one::oned::install'] ->
   Class['one::oned::config'] ~>
   Class['one::oned::service'] ~>

manifests/oned/config.pp

@@ -35,6 +35,7 @@
   $backup_intervall     = $one::params::backup_intervall,
   $backup_keep          = $one::params::backup_keep,
   $debug_level          = $one::debug_level,
+  $backend              = $one::backend,
   ) {
 
   File {
@@ -43,9 +44,10 @@
   }
 
   file { '/etc/one/oned.conf':
-    content => template('one/oned.conf.erb'),
+    ensure  => 'file',
     owner   => 'root',
     mode    => '0640',
+    content => template('one/oned.conf.erb'),
   }
 
   file { '/usr/share/one':
@@ -63,14 +65,14 @@
     source  => $hook_scripts_path,
   }
 
-  if ($one::backend == 'mysql') {
+  if ($backend == 'mysql') {
     file { $backup_dir:
       ensure => 'directory',
       mode   => '0700'
     }
 
     file { $backup_script_path:
-      ensure  => present,
+      ensure  => 'file',
       mode    => '0700',
       content => template('one/one_db_backup.sh.erb'),
     }

manifests/params.pp

@@ -48,8 +48,8 @@
   $one_repo_enable = hiera('one::enable_opennebula_repo', 'true' ),
 
   $backup_script_path        = hiera ('one::oned::backup::script_path', '/var/lib/one/bin/one_db_backup.sh'),
-  $ssh_priv_key_param = hiera('one::head::ssh_priv_key',undef),
-  $ssh_pub_key  = hiera('one::head::ssh_pub_key',undef),
+  $ssh_priv_key_param        = hiera('one::head::ssh_priv_key',undef),
+  $ssh_pub_key               = hiera('one::head::ssh_pub_key',undef),
 
   $xmlrpc_maxconn            = hiera('one::oned::xmlrpc_maxconn', '15'),
   $xmlrpc_maxconn_backlog    = hiera('one::oned::xmlrpc_maxconn_backlog', '15'),

spec/classes/one__oned__config_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'rspec-puppet'
+require 'hiera'
+require 'facter'
+
+hiera_config = 'spec/fixtures/hiera/hiera.yaml'
+
+describe 'one::oned::config' do
+  let (:facts) { {:osfamily => 'RedHat'} }
+  let (:hiera_config) { hiera_config }
+  context 'general' do
+  end
+  context 'general' do
+    it { should contain_class('one::oned::config') }
+    it { should contain_file('/etc/one/oned.conf') \
+                    .with_ensure('file' )\
+                    .with_owner('root') \
+                    .with_mode('0640')
+    }
+    it { should contain_file('/usr/share/one/hooks') \
+                    .with_ensure('directory') \
+                    .with_mode('0750')
+    }
+    it { should contain_file('/usr/share/one').with_ensure('directory') }
+  end
+  context 'with mysql backend' do
+    let (:params) { {
+        :backend => 'mysql',
+        :backup_script_path => '/var/lib/one/bin/one_db_backup.sh',
+        :backup_dir => '/srv/backup'
+    } }
+    it { should contain_file('/srv/backup') }
+    it { should contain_file('/var/lib/one/bin/one_db_backup.sh') }
+    it { should contain_cron('one_db_backup')}
+
+  end
+end

templates/one_db_backup.sh.erb

@@ -8,11 +8,12 @@ DB_BACKUP='<%= @backup_db %>'
 BACKUP_DIR='<%= @backup_dir %>'
 BACKUP_FILE=$(hostname)-$(date +%F_%H-%M-%S).sql
 BACKUP_OPTS='<%= @backup_opts %>'
+BACKUP_KEEP='<%= @backup_keep %>'
 
 if [ -d $BACKUP_DIR ]; then
     mysqldump -h $DB_HOST -u $DB_USER -p$DB_PASSWORD $BACKUP_OPTS -r $BACKUP_DIR/$BACKUP_FILE -B $DB_BACKUP
-    bzip2 -9 $BACKUP_DIR/$BACKUP_FILE
-    find $BACKUP_DIR -type f -mtime +15 -exec rm {} +
+    gzip $BACKUP_DIR/$BACKUP_FILE
+    find $BACKUP_DIR -type f $BACKUP_KEEP -delete
 else
     echo 'Backup directory does not exist.'
     exit 1