Fixes #14833: Use rudder agent check at postinst and factory reset to avoid duplacing code #215
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
amousset
reviewed
May 9, 2019
amousset
reviewed
May 9, 2019
share/commands/agent-check
Outdated
| rudder agent reset | ||
| fi | ||
| echo " Done" | ||
| [ "$QUIET" = false ] && printf "INFO: Promises absent restoring initial version, and updating ..." |
There was a problem hiding this comment.
"Policies absent, restoring"...
amousset
reviewed
May 9, 2019
share/commands/agent-check
Outdated
| fi | ||
| if ! ${CFE_DIR}/bin/cf-promises -f failsafe.cf > /dev/null || ! ${CFE_DIR}/bin/cf-promises > /dev/null | ||
| then | ||
| [ "$QUIET" = false ] && printf "${YELLOW}WARNING${NORMAL}: Promises invalid, reseting to initial promises and updating..." |
|
Commit modified |
amousset
reviewed
May 9, 2019
share/commands/agent-check
Outdated
| @@ -113,9 +127,9 @@ check_and_fix_cfengine_processes() { | |||
| CF_EXECD_RUNNING=`${PS_COMMAND} | grep "${CFE_DIR}/bin/cf-execd" | sed -e '/grep/d' | cat` | |||
| NB_CF_EXECD_RUNNING=`echo "${CF_EXECD_RUNNING}" | sed -e '/^$/d' | wc -l` | |||
| if [ ${NB_CF_EXECD_RUNNING} -gt 1 ]; then | |||
| printf "WARNING: Too many instance of CFEngine cf-execd processes running. Killing them..." | |||
| [ "$QUIET" = false ] && printf "${YELLOW}WARNING${NORMAL}: Too many instance of CFEngine cf-execd processes running. Killing them..." | |||
There was a problem hiding this comment.
CFEngine cf-execd -> Rudder cf-execd
amousset
reviewed
May 9, 2019
share/commands/agent-check
Outdated
| fi | ||
|
|
||
| # Check for anomalous number of CFEngine processes | ||
| # If there are more than 6 agent/executor processes, we should kill them, and purge the lock database | ||
| # 6 means 1 cf-execd + 5 cf-agent | ||
| if [ "${NB_CF_PROCESS_RUNNING}" -gt 6 ]; then | ||
| printf "WARNING: Too many instance of CFEngine processes running. Killing them, and purging the CFEngine lock database..." | ||
| [ "$QUIET" = false ] && printf "${YELLOW}WARNING${NORMAL}: Too many instance of CFEngine processes running. Killing them, and purging the CFEngine lock database..." |
There was a problem hiding this comment.
CFEngine processes -> Agent processes
amousset
reviewed
May 9, 2019
| echo "********************************************************************************" | ||
| echo "rudder-agent has been installed (not started). This host can be a Rudder node." | ||
| echo "To get started, configure your Rudder server's hostname and continue the process:" | ||
| echo "# echo 'rudder.server' > ${CFE_DIR}/policy_server.dat" |
There was a problem hiding this comment.
we should display /opt/rudder/etc instead here
There was a problem hiding this comment.
I think this is the lase place that should be changed since if the symlink was not created this will fail
|
Commit modified |
amousset
approved these changes
May 9, 2019
|
OK, squash merging this PR |
… avoid duplacing code
Normation-Quality-Assistant
force-pushed
the
arch_14833/use_rudder_agent_check_at_postinst_and_factory_reset_to_avoid_duplacing_code
branch
from
a9ce466
to
517e0a6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.rudder.io/issues/14833