diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-04 21:20:20 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-04 21:20:20 +0100 |
| commit | 89c7d1dea4af6026af00624af77bb1a08c8ebd53 (patch) | |
| tree | 6c3b46adcdadcd75aada126cacf0a36202f31e3e /modules/base_installation/files/scripts/puppet_reset_and_apply | |
| parent | a77b768abb31be9e19563e130d763f163496477d (diff) | |
| parent | c17e63ed33a5260ea5bf0f869d7dce39676526cb (diff) | |
| download | Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.tar.gz Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.tar.zst Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.zip | |
Merge branch 'new_node'
Diffstat (limited to 'modules/base_installation/files/scripts/puppet_reset_and_apply')
| -rw-r--r-- | modules/base_installation/files/scripts/puppet_reset_and_apply | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/modules/base_installation/files/scripts/puppet_reset_and_apply b/modules/base_installation/files/scripts/puppet_reset_and_apply new file mode 100644 index 0000000..ff71aa8 --- /dev/null +++ b/modules/base_installation/files/scripts/puppet_reset_and_apply | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | #!/bin/bash | ||
| 2 | |||
| 3 | cd /etc/puppetlabs/code | ||
| 4 | git fetch origin | ||
| 5 | |||
| 6 | branch="master" | ||
| 7 | if [ -n "$1" ]; then | ||
| 8 | branch="$1" | ||
| 9 | fi | ||
| 10 | |||
| 11 | git reset --hard origin/$1 | ||
| 12 | |||
| 13 | git submodule update --init | ||
| 14 | puppet apply --test manifests/site.pp | ||