aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/admin_node.pp2
-rw-r--r--templates/bin/puppet-bootstrap2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/admin_node.pp b/manifests/admin_node.pp
index bc314e9..22b08fd 100644
--- a/manifests/admin_node.pp
+++ b/manifests/admin_node.pp
@@ -1,5 +1,5 @@
class admin_node {
- nodo::vserver::instance { "$host-master":
+ nodo::vserver::instance { "$hostname-master":
context => '2',
puppetmaster => true,
}
diff --git a/templates/bin/puppet-bootstrap b/templates/bin/puppet-bootstrap
index 70b5da8..57f5f28 100644
--- a/templates/bin/puppet-bootstrap
+++ b/templates/bin/puppet-bootstrap
@@ -13,7 +13,7 @@ function add_submodules {
repos="`lynx -dump http://git.sarava.org/?a=project_index | awk '{ print $1 }' | grep ^puppet-`"
for repo in $repos; do
- module="`basename $repo .git | cut -d - -f 2`"
+ module="`basename $repo .git | sed -e s/puppet-//`"
if [ ! -d "modules/$module" ]; then
git submodule add git://git.sarava.org/puppet-$module.git modules/$module
fi