diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-03-04 14:23:21 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-03-04 14:23:21 -0300 |
| commit | b15d4b2dc5a936052a7477a9c6ace3ac38e81dd1 (patch) | |
| tree | 6756b587777d68ce7a8b672a5695e18039a70f35 | |
| parent | 6083f9b9a7f14deff710593234701de640fbff7f (diff) | |
| download | hydra-b15d4b2dc5a936052a7477a9c6ace3ac38e81dd1.tar.gz hydra-b15d4b2dc5a936052a7477a9c6ace3ac38e81dd1.tar.bz2 | |
Updating for puppet-bootstrap compatibility
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | lib/hydra/config | 1 | ||||
| -rwxr-xr-x | share/hydractl/bootstrap | 7 |
3 files changed, 7 insertions, 3 deletions
@@ -37,5 +37,5 @@ Creating a new network To create the needed repositories to start a new network, use a similar command: - hydra example init ~/file/example + hydra example init ~/file/example hydra example config domain example.org diff --git a/lib/hydra/config b/lib/hydra/config index 8dbda89..fe7606e 100644 --- a/lib/hydra/config +++ b/lib/hydra/config @@ -78,6 +78,7 @@ function hydra_bootstrap_config { ( cd $config + make deps make submodules make config ) diff --git a/share/hydractl/bootstrap b/share/hydractl/bootstrap index 3821dd7..0d60b50 100755 --- a/share/hydractl/bootstrap +++ b/share/hydractl/bootstrap @@ -23,11 +23,14 @@ if [ "$STAGE" == "repository" ]; then if [ ! -d "/etc/puppet/.git" ]; then rm -rf /etc/puppet && git clone git://git.sarava.org/puppet-bootstrap /etc/puppet - chown -R puppet. /etc/puppet hydra_bootstrap_config /etc/puppet + chown -R puppet. /etc/puppet fi fi if [ -e "/etc/puppet/manifests/$stage.pp" ]; then - puppet apply /etc/puppet/manifests/$stage.pp + ( + cd /etc/puppet + make apply stage=$stage + ) fi |