diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-21 11:28:12 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-21 11:28:12 -0300 |
| commit | 6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d (patch) | |
| tree | 4e9745c0c73d74cb85fe91e1113f20652bb9c4f8 /share/hydractl/puppet-initialize | |
| parent | e40b3514e041a4bb2aac962b639c947333365b4b (diff) | |
| parent | 8addf3ea71f50050a791e618bd4511860264c0de (diff) | |
| download | hydra-6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d.tar.gz hydra-6ebba3b8240d58ae749216ffa6254b9f7d2a2b9d.tar.bz2 | |
Merge branch 'master' into develop
Conflicts:
TODO.md
share/hydra/install
share/hydra/mass
share/hydractl/bootstrap
share/hydractl/puppet-enable
share/hydractl/system-upgrade
Diffstat (limited to 'share/hydractl/puppet-initialize')
| -rwxr-xr-x | share/hydractl/puppet-initialize | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/share/hydractl/puppet-initialize b/share/hydractl/puppet-initialize deleted file mode 100755 index 26b0165..0000000 --- a/share/hydractl/puppet-initialize +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# Make puppet agent first connection with the master node. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. - -puppet agent --server puppet.`facter domain` --pluginsync true --waitforcert 60 --test \ - --vardir /var/lib/puppet --ssldir /var/lib/puppet/ssl $* |