Mobrovac has uploaded a new change for review. https://gerrit.wikimedia.org/r/309963
Change subject: service::node: Also do the Scap fetch phase when refreshing the config ...................................................................... service::node: Also do the Scap fetch phase when refreshing the config If the values controlled by Puppet change, a new config needs to be assembled for the service. However, Scap3 uses the last deployed revision, which means that if it hasn't been deployed yet, git won't be able to check it out on the next deploy. To countermeasure this, do a local fetch phase before the config deploy to ensure we do not run into this problem. Change-Id: I341e1cac67c125a1185d2f81501ca07aaf5e8998 --- M modules/service/templates/node/apply-config.sh.erb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/309963/1 diff --git a/modules/service/templates/node/apply-config.sh.erb b/modules/service/templates/node/apply-config.sh.erb index 5ae72d9..63bb45f 100755 --- a/modules/service/templates/node/apply-config.sh.erb +++ b/modules/service/templates/node/apply-config.sh.erb @@ -3,5 +3,6 @@ # Do not modify it manually set -e +/usr/bin/scap deploy-local -D 'log_json:False' --repo <%= @repo %> fetch; /usr/bin/scap deploy-local -D 'log_json:False' --repo <%= @repo %> --force config_deploy; <%- if @auto_refresh %>/usr/bin/scap deploy-local -D 'log_json:False' --repo <%= @repo %> --force restart_service;<%- end -%> -- To view, visit https://gerrit.wikimedia.org/r/309963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I341e1cac67c125a1185d2f81501ca07aaf5e8998 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
