diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-08-23 15:00:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-03 03:24:02 +0200 |
| commit | 0749c44d42a1e68c5a661e4c6a2111ae7ae98aa1 (patch) | |
| tree | 6e46e2424d4176f6ae83f4e2f225d2f5fef502fb /bootstrap/ubuntu1004_bootstrap.sh | |
| parent | d878a6fea2f4565a3fca2754f7a62afe898204aa (diff) | |
Added an interactively configurable external node classifier
Prior to this change, the type of host to be managed was based on the
hostname, as per default puppet behavior. This required adding various
patterns into a private overlay repository (private_nodes module), and
naming hosts according to those patterns.
The new setup uses a simple configuration file which can be
interactively configured at bootstrap time, hopefully making it much
easier to get started with this repository. This also reduces the usage
of the private overlay repository (which should eventually be
eliminated).
Change-Id: Ide4f1d9360a19b16b3dcaedf993951725932a011
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
Diffstat (limited to 'bootstrap/ubuntu1004_bootstrap.sh')
| -rwxr-xr-x | bootstrap/ubuntu1004_bootstrap.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap/ubuntu1004_bootstrap.sh b/bootstrap/ubuntu1004_bootstrap.sh index ec65bdd..0ed34c1 100755 --- a/bootstrap/ubuntu1004_bootstrap.sh +++ b/bootstrap/ubuntu1004_bootstrap.sh @@ -36,11 +36,11 @@ if ! test -d /var/qtqa/sysadmin; then git clone "$REPO" /var/qtqa/sysadmin fi +echo "Configuring this node..." +/var/qtqa/sysadmin/puppet/nodecfg.pl -interactive + # Run puppet once. echo "Running puppet..." /var/qtqa/sysadmin/puppet/sync_and_run.pl set +x echo 'All done :-)' -echo 'If this host already has an entry in manifests/nodes.pp, nothing needs to be done...' -echo "Otherwise, puppet is ready to go but will not do anything until you add an entry for $(facter fqdn) to manifests/nodes.pp" - |