258d6233a2
Previously the run_all.sh script would run puppet even if git is not properly updated or if our puppet modules fail to install. Now set -e in the script so that any failure to update git or install puppet modules causes run_all.sh to bail out early. This is important to ensure that we get consistent and expected results from puppet when it runs. Change-Id: Icb3fb2a97d11675762b49c57978b08115bfcbc04
32 lines
1.1 KiB
Bash
Executable File
32 lines
1.1 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Copyright 2014 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
# If updating the puppet system-config repo or installing puppet modules
|
|
# fails then abort the puppet run as we will not get the results we
|
|
# expect.
|
|
set -e
|
|
|
|
cd /opt/system-config/production
|
|
git fetch -a && git reset -q --hard @{u}
|
|
./install_modules.sh
|
|
|
|
# One must touch manifests/site.pp to trick puppet into re-loading modules
|
|
# some times
|
|
touch manifests/site.pp
|
|
|
|
# Run this as an external script so that the above pull will get new changes
|
|
ansible-playbook /etc/ansible/remote_puppet.yaml >> /var/log/puppet_run_all.log 2>&1
|