Infer major version from datadog_agent_version #239
Merged
Conversation
This file contains hidden or 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
KSerrania
force-pushed
the
kserrania/infer-major-version
branch
from
8bbc296 to
316a0dd
Compare
albertvaka
reviewed
Dec 13, 2019
Co-Authored-By: Albert Vaca <albert.vaca@datadoghq.com>
albertvaka
approved these changes
Dec 16, 2019
KSerrania
added a commit
that referenced
this pull request
Dec 18, 2019
* Agent 7 support Adds Agent 7 install support. The datadog_agent5 option is deprecated and replaced by datadog_agent_major_version, which can be set to 5, 6 or 7. If set, the datadog_agent_version option must have the major version specified in datadog_agent_major_version. For Agent 6 and 7, the datadog_apt_repo, datadog_yum_repo, datadog_zypper_repo options have been changed: if they're not set, the module will use the official Datadog repository for the major version specified in datadog_agent_major_version. If they're set, the specified repository will be used, regardless of the datadog_agent_major_version set. * Infer major version from datadog_agent_version (#239) If datadog_agent_version is set, extracts the major version from it and sets datadog_agent_major_version with this value. If datadog_agent_major_version is already set, checks that the two variables are compatible, otherwise raises an error. Co-Authored-By: Albert Vaca <albert.vaca@datadoghq.com> Co-Authored-By: maxime mouial <hush-hush@users.noreply.github.com> Co-Authored-By: Olivier Vielpeau <olivielpeau@users.noreply.github.com>
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.
What does this PR do?
If
datadog_agent_versionis set, extracts the major version from it and setsdatadog_agent_major_versionwith this value.If
datadog_agent_major_versionis already set, checks that the two variables are compatible, otherwise raises an error.Additional notes
Due to this, we need to cast
datadog_agent_major_versionto a string (as the extracted major version is a string) in all cases.