Changeset 30969 for other-projects/hathitrust/vagrant-solr-cluster/trunk

Timestamp:

2016-10-27T23:09:24+13:00 (7 years ago)

Author:

davidb

Message:

Fine tuning resulting from testing the cloud/cluster

Location:

other-projects/hathitrust/vagrant-solr-cluster/trunk

Files:

• manifests/base-zookeeper-solr.pp (modified) (1 diff)
• modules/solr/manifests/init.pp (modified) (1 diff)
• modules/solr/templates/setup-solr.bash (modified) (1 diff)
• modules/solr/templates/solr-init-collection.sh (added)
• modules/zookeeper/files/bash_profile (added)
• modules/zookeeper/files/bashrc (added)
• modules/zookeeper/manifests/init.pp (modified) (1 diff)
• modules/zookeeper/templates/solr-start-all.sh (added)

other-projects/hathitrust/vagrant-solr-cluster/trunk/manifests/base-zookeeper-solr.pp

@@ -120 +120 @@
 }
 
+ file { 
+  "/home/${user}/.bashrc":
+  source => "puppet:///modules/zookeeper/bashrc",
+  ensure => present,
+  mode => 644,
+  owner => $user,
+  group => $group,
+  require => File["/home/${user}"]
+ }
+
+ file { 
+  "/home/${user}/.bash_profile":
+  source => "puppet:///modules/zookeeper/bash_profile",
+  ensure => present,
+  mode => 644,
+  owner => $user,
+  group => $group,
+  require => File["/home/${user}"]
+ }
+
+
 host { 'solr1':
     ip => "${solr_1}",

other-projects/hathitrust/vagrant-solr-cluster/trunk/modules/solr/manifests/init.pp

@@ -46 +46 @@
  }
 
+ file { 
+  "/home/${user}/solr-init-collection.sh":
+  content => template('solr/solr-init-collection.sh'),
+  ensure => present,
+  mode => 755,
+  owner => $user,
+  group => $group,
+  require => File["/home/${user}"]
+ }
+
+
 }
 

other-projects/hathitrust/vagrant-solr-cluster/trunk/modules/solr/templates/setup-solr.bash

@@ -1 +1 @@
 
 export SOLR_HOME="<%= @solr_home %>/server/solr"
-export PATH="$SOLR_HOME/bin:$PATH"
+export PATH="<%= @solr_home %>/bin:$PATH"
 
 alias solr-start-node.sh="solr start -c -z zookeeper:2181 -h `hostname`:8983"

other-projects/hathitrust/vagrant-solr-cluster/trunk/modules/zookeeper/manifests/init.pp

@@ -75 +75 @@
     require => [  Exec["unpack_zookeeper"], File["/home/${user}"] ] 
  }
+
+ file { 
+  "/home/${user}/solr-start-all.sh":
+  content => template('zookeeper/solr-start-all.sh'),
+  ensure => present,
+  mode => 755,
+  owner => $user,
+  group => $group,
+  require => File["/home/${user}"]
+ }
+
 }