compare-puppet-catalogs: minor tweaks

lavagetto · lavagetto · commit 9d69fdcfaea0 · 2014-05-16T11:50:41.000+02:00
I did my best to make the software NOT depend on being run as root out
of vagrant, and in general to play nicer for a "production" installation.

Change-Id: I72c5b17b58c327b973279bc89966bc6c44a56259
Signed-off-by: Giuseppe Lavagetto &lt;glavagetto@wikimedia.org&gt;
diff --git a/compare-puppet-catalogs/provision.sh b/compare-puppet-catalogs/provision.sh
@@ -2,7 +2,7 @@
 
 apt-get update
 apt-get -y install curl git-core vim python-pip python-dev
-apt-get -y install ruby1.8 rubygems ruby-bundler ruby1.8-dev
+apt-get -y install ruby1.8 rubygems ruby-bundler ruby1.8-dev ruby-bcrypt
 echo mysql-server-5.5 mysql-server/root_password password cucciolo | debconf-set-selections
 echo mysql-server-5.5 mysql-server/root_password_again password cucciolo | debconf-set-selections
 apt-get install -y mysql-common mysql-server mysql-client
diff --git a/compare-puppet-catalogs/puppet_compare/app_defaults.py b/compare-puppet-catalogs/puppet_compare/app_defaults.py
@@ -1,7 +1,7 @@
 import os
 MYDIR=os.path.dirname(os.path.realpath(__file__))
 PARENT=os.path.realpath(os.path.join(MYDIR,'..'))
-BASEDIR = os.environ.get('PUPPET_DIFFER_BASEDIR', '/vagrant')
+BASEDIR = os.environ.get('PUPPET_COMPILER_BASEDIR', PARENT)
 get_path = lambda x: os.path.join(BASEDIR, x)
 COMPILE_SCRIPT = get_path('shell/compile')
 FETCH_CHANGE = get_path('shell/prepare_change')
diff --git a/compare-puppet-catalogs/puppet_compare/generator.py b/compare-puppet-catalogs/puppet_compare/generator.py
@@ -16,8 +16,9 @@
 
 
 def run(cmd, sudo=False, sudo_user='root', capture=True):
+    env = os.environ.copy()
     if sudo:
-        cmd = "sudo -u %s '%s'" % (sudo_user, cmd)
+        cmd = "sudo -E -u %s '%s'" % (sudo_user, cmd)
 
     cmdlist = shlex.split(cmd)
 
@@ -27,7 +28,7 @@ def run(cmd, sudo=False, sudo_user='root', capture=True):
         # This just works in python 2.7. Wrap this again?
         method = subprocess.check_call
 
-    return method(cmdlist)
+    return method(cmdlist, env=env)
 
 
 def ruby(cmd, **kwdargs):
diff --git a/compare-puppet-catalogs/shell/compile b/compare-puppet-catalogs/shell/compile
@@ -16,6 +16,14 @@ else
     CHANGE=${4}
 fi;
 
+# Get the password externally, or use the default
+if [ -z ${PUPPET_DIFFER_MYSQL_PWD} ]; then
+    DBPASSWORD='puppet'
+else
+    DBPASSWORD=${PUPPET_COMPILER_MYSQL_PWD}
+fi;
+
+
 ETCDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PUPPET_VERSION=${1}
 MY_GEMDIR=${ETCDIR}/env_puppet_${PUPPET_VERSION}
@@ -45,7 +53,7 @@ TIME_FILE=$CATALOG_DIR/$2.time
 WARNINGS_FILE=$CATALOG_DIR/$2.warnings
 
 if [ "$PUPPET_VERSION" == "3" ]; then
-    COMPILE_OPTIONS="--storeconfigs true --thin_storeconfigs true --dbadapter mysql --dbserver localhost --dbuser puppet --dbpassword puppet"
+    COMPILE_OPTIONS="--storeconfigs true --thin_storeconfigs true --dbadapter mysql --dbserver localhost --dbuser puppet --dbpassword $DBPASSWORD"
 else
     # storeconfigs gets you issues with compiling 2.7 catalogs
     # Verified on palladium, with storeconfigs the format of compiled catalogs changes in 2.7
diff --git a/compare-puppet-catalogs/shell/differ b/compare-puppet-catalogs/shell/differ
@@ -18,5 +18,5 @@ OUT_DIR=${2}
 OUTPUT_FILE=${OUT_DIR}/${1}.diff
 
 test -d ${OUT_DIR} || mkdir -p ${OUT_DIR}
-bundle exec puppet catalog diff --content_diff ${OLD_CATALOG_DIR}/${1}.pson ${NEW_CATALOG_DIR}/${1}.pson > ${OUTPUT_FILE}
+bundle exec puppet catalog diff --modulepath=${PARENT}/external/puppet/modules --content_diff ${OLD_CATALOG_DIR}/${1}.pson ${NEW_CATALOG_DIR}/${1}.pson > ${OUTPUT_FILE}
 popd
diff --git a/compare-puppet-catalogs/shell/env_puppet_2.7/.gitignore b/compare-puppet-catalogs/shell/env_puppet_2.7/.gitignore
diff --git a/compare-puppet-catalogs/shell/env_puppet_2.7/Gemfile.lock b/compare-puppet-catalogs/shell/env_puppet_2.7/Gemfile.lock
@@ -11,9 +11,6 @@ GEM
     activeresource (2.3.14)
       activesupport (= 2.3.14)
     activesupport (2.3.14)
-    bcrypt (3.1.7)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
     facter (1.7.5)
     hiera (1.3.2)
       json_pure
@@ -34,7 +31,6 @@ GEM
       rake (>= 0.8.3)
     rake (10.3.1)
     trocla (0.0.9)
-      bcrypt-ruby
       highline
       moneta (~> 0.7.2)
 
diff --git a/compare-puppet-catalogs/shell/env_puppet_3/Gemfile.lock b/compare-puppet-catalogs/shell/env_puppet_3/Gemfile.lock
@@ -11,9 +11,6 @@ GEM
     activeresource (2.3.14)
       activesupport (= 2.3.14)
     activesupport (2.3.14)
-    bcrypt (3.1.7)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
     facter (1.7.5)
     hiera (1.3.2)
       json_pure
@@ -35,7 +32,6 @@ GEM
     rake (10.3.1)
     rgen (0.6.6)
     trocla (0.0.9)
-      bcrypt-ruby
       highline
       moneta (~> 0.7.2)
 
diff --git a/compare-puppet-catalogs/shell/helper b/compare-puppet-catalogs/shell/helper
@@ -104,7 +104,11 @@ function update() {
 }
 
 function copy_facts() {
-    test -f ${FACTS_ARCHIVE} || ( log "Could not find ${FACTS_ARCHIVE}" && exit 1)
+    # there is no need to block run if facts are not in place.
+    if [ ! -f ${FACTS_ARCHIVE} ]; then
+        log "Could not find ${FACTS_ARCHIVE}"
+        return
+    fi;
     # This expects a file called puppet-facts.tar.xz in the parent of the installation
     pushd ${EXTDIR}
     log "Extracting the facts archive"
@@ -117,6 +121,7 @@ function purge() {
     rm -rf ${PRIVATEDIR}
     rm -rf ${DIR}/var/yaml
 }
+
 function setup_naggen() {
     if [ ! -f /usr/local/bin/naggen ];  then
         cp ${PUPPETDIR}/modules/puppetmaster/files/naggen /usr/local/bin/naggen
