add memcache to open ports

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 6d73b4a05c2d7ff0bf0644a15552a8f19b141f41..3ab0d631ad6097933996415f1c4a3bdbac29758b 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -19,6 +19,10 @@ class ferm::per-host {
                        }
                }
                oyens: {
+                       @ferm::rule { 'dsa-memcache':
+                               description     => 'Allow memcache access',
+                               rule            => '&SERVICE_RANGE(tcp, 11211, ( 5.153.231.240/27 172.29.123.0/24 ))'
+                       }
                        @ferm::rule { 'dsa-amqp':
                                description     => 'Allow rabbitmq access',
                                rule            => '&SERVICE_RANGE(tcp, 5672, ( 5.153.231.240/27 172.29.123.0/24 ))'

diff --git a/tools/git-hooks/pre-commit b/tools/git-hooks/pre-commit
index 8364fdce3e0432bd2ae47521293c546c29f5b038..4406089770ba7baaaa39f81b915040a00a918e40 100755 (executable)
--- a/tools/git-hooks/pre-commit
+++ b/tools/git-hooks/pre-commit
@@ -21,7 +21,7 @@ check_puppet_manifest () {
         git cat-file blob :0:${file} | sed 's/^import .*/#&/' >${pp}
         trap "rm -f ${pp}" RETURN
 
-        local output=$(puppet parser validate --storeconfigs true ${pp} 2>&1)
+        local output=$(puppet parser validate ${pp} 2>&1)
         if [ $? -ne 0 ] || [ -n "${output}" ]; then
                 echo '** Syntax check failed:' >&2
                 echo "${output}" >&2