generators: Use new cloud-init config keys #580
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
monstermunchkin
force-pushed
the
features/cloud-init
branch
from
c682281
to
c8aa0c7
Compare
stgraber
reviewed
Nov 11, 2021
stgraber
reviewed
Nov 11, 2021
monstermunchkin
force-pushed
the
features/cloud-init
branch
from
c8aa0c7
to
8a56120
Compare
stgraber
reviewed
Nov 13, 2021
generators/cloud-init.go
Outdated
Comment on lines
123
to
127
| content = `{%- if config_get("cloud-init.user-data", properties.default) == properties.default -%} | ||
| {{ config_get("user.user-data", properties.default) }} | ||
| {%- else -%} | ||
| {{- config_get("cloud-init.user-data", properties.default) }} | ||
| {%- endif -%} |
There was a problem hiding this comment.
All of this should be vendor-data, not user-data, no?
stgraber
reviewed
Nov 13, 2021
generators/cloud-init_test.go
Outdated
Comment on lines
118
to
122
| `{%- if config_get("cloud-init.user-data", properties.default) == properties.default -%} | ||
| {{ config_get("user.user-data", properties.default) }} | ||
| {%- else -%} | ||
| {{- config_get("cloud-init.user-data", properties.default) }} | ||
| {%- endif -%} |
There was a problem hiding this comment.
Same as above, all of this is supposed to be vendor-data, not user-data.
stgraber
reviewed
Nov 13, 2021
| {{ config_get("user.network-config", "") }} | ||
| {%- else -%} | ||
| {{- config_get("cloud-init.network-config", "") }} | ||
| {%- endif -%} |
There was a problem hiding this comment.
What's going on here, where is our default network config going?
There was a problem hiding this comment.
Oops. I moved that to properties["default"] but had forgotten to include it. Fixed now.
Signed-off-by: Thomas Hipp <thomas.hipp@canonical.com>
monstermunchkin
force-pushed
the
features/cloud-init
branch
from
8a56120
to
d18ac36
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.
This uses and prefers the new
cloud-initconfig keys (cloud-init.network-config,cloud-init.user-data, andcloud-init.vendor-data) for anycloud-initconfiguration. The old config keys (user.network-config,user.user-data, anduser.vendor-data) are still available and will not be removed. They will serve a fallback keys if the new keys aren't used.Signed-off-by: Thomas Hipp thomas.hipp@canonical.com