Fixes #13622: Add a flag library #847
Merged
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
ncharles
reviewed
Oct 15, 2018
| "cfengine_port" string => "5308"; | ||
| pass2.!flag_file_defined:: | ||
| "flag_file" string => "/var/rudder/agent-data/flags.json"; |
There was a problem hiding this comment.
we need something to create this folder
There was a problem hiding this comment.
Indeed, this should be part of the system techniques I think
| "${configuration.flag_file}" | ||
| create => "true", | ||
| template_method => "mustache", | ||
| edit_template => "${sys.workdir}/modules/templates/datastate.json.tpl", |
There was a problem hiding this comment.
you are missing this file in the PR
There was a problem hiding this comment.
It is already used for jinja templating.
|
|
||
| # Pass3 to avoid reading the json at each pass... | ||
| pass3.file_exists:: | ||
| "ncf_flags.data" data => readjson("${configuration.flag_file}"), |
There was a problem hiding this comment.
could you document somewhere in the file the expected format of flag file ?
amousset
force-pushed
the
arch_13622/add_a_flag_library
branch
from
7d9329d
to
33e8bb4
Compare
|
Commit modified |
amousset
commented
Oct 15, 2018
| @@ -16,6 +16,13 @@ bundle common ncf_inputs | |||
|
|
|||
| } | |||
|
|
|||
| # Load a custom ncf.conf for tests | |||
There was a problem hiding this comment.
This was needed to use a different flag file.
amousset
force-pushed
the
arch_13622/add_a_flag_library
branch
from
33e8bb4
to
d9cca05
Compare
|
Commit modified |
amousset
force-pushed
the
arch_13622/add_a_flag_library
branch
from
d9cca05
to
5e744cb
Compare
|
Commit modified |
ncharles
reviewed
Oct 17, 2018
| "ok_5" expression => strcmp("${test.set5[1]}", "ok"); | ||
| "ok_6" expression => strcmp("${test.get6[1]}", "set"); | ||
| "ok_7" expression => strcmp("${test.set7[1]}", "notreserved"); | ||
| "ok_8" expression => strcmp("${test.get8[1]}", "set"); |
ncharles
approved these changes
Oct 17, 2018
|
OK, merging this PR |
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://www.rudder-project.org/redmine/issues/13622