--- a/dev/modules/sysconfig/manifests/django_init.pp Wed Mar 12 17:19:23 2014 +0100
+++ b/dev/modules/sysconfig/manifests/django_init.pp Fri Mar 14 03:08:58 2014 +0100
@@ -1,17 +1,9 @@
class sysconfig::django_init (
- $superuser_name = hiera('sysconfig::params::superuser_name' ,$sysconfig::params::superuser_name ),
- $superuser_pw = hiera('sysconfig::params::superuser_pw' ,$sysconfig::params::superuser_pw ),
- $user_edit_name = hiera('sysconfig::params::user_edit_name' ,$sysconfig::params::user_edit_name ),
- $user_edit_pw = hiera('sysconfig::params::user_edit_pw' ,$sysconfig::params::user_edit_pw ),
- $user_com_name = hiera('sysconfig::params::user_com_name' ,$sysconfig::params::user_com_name ),
- $user_com_pw = hiera('sysconfig::params::user_com_pw' ,$sysconfig::params::user_com_pw ),
- $user_observ_name = hiera('sysconfig::params::user_observ_name' ,$sysconfig::params::user_observ_name ),
- $user_observ_pw = hiera('sysconfig::params::user_observ_pw' ,$sysconfig::params::user_observ_pw ),
- $testserver_port = hiera('sysconfig::params::testserver_port' ,$sysconfig::params::testserver_port )
-
+ $superuser_name = hiera('sysconfig::params::superuser_name', $sysconfig::params::superuser_name ),
+ $superuser_pw = hiera('sysconfig::params::superuser_pw' , $sysconfig::params::superuser_pw )
) inherits sysconfig::params {
- notify {'django_init': name => "\$superuser_name : ${superuser_name}, \$superuser_pw : ${superuser_pw}", withpath => true }->
+ notify {'django_init': name => "django init \$superuser_name : ${superuser_name}, \$superuser_pw : ${superuser_pw}", withpath => true }->
exec { 'syncdb':
command => '/srv/comt/bin/django syncdb --noinput --migrate',
@@ -32,24 +24,4 @@
require => Exec['syncdb']
}
- file { 'karma_workspace_info':
- ensure => 'present',
- path => "/srv/comt/src/cm/scripts/test-suite/workspace.info.js",
- replace => 'no',
- owner => 'vagrant',
- group => 'vagrant',
- mode => 644,
- content => template('sysconfig/workspace.info.js.erb','sysconfig/url.workspace.info.js.erb'),
- }
-
- file { 'karma_workspace_info_full':
- ensure => 'present',
- path => "/srv/comt/src/cm/scripts/test-suite/workspace.info.full.js",
- replace => 'no',
- owner => 'vagrant',
- group => 'vagrant',
- mode => 644,
- content => template('sysconfig/workspace.info.js.erb','sysconfig/url.test.workspace.info.js.erb'),
- }
-
}
\ No newline at end of file