Fallback to 'local-fan' #612
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
If 'public' or 'local-cloud' are missing from the unit data, fallback to 'local-fan', in case of containers using solely fan networking and no provider network. Fixes juju#611
|
Can one of the admins verify this patch? |
6 similar comments
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
|
This will have to wait until we have further discussion on how to proceed with dns names. |
cderici
reviewed
Jan 4, 2022
juju/machine.py
Outdated
| @@ -239,6 +239,8 @@ def dns_name(self): | |||
| scope = address['scope'] | |||
| if scope == 'public' or scope == 'local-cloud': | |||
There was a problem hiding this comment.
Python's logic ops like or are short-circuiting (e.g. 1 or 1/0 or 3 will produce 1), so it might make it cleaner if you just add or scope == 'local-fan' at the end of this line.
manadart
requested changes
Jan 4, 2022
Checks in sequence for public, local-cloud and local-fan Returns the first match, if any, None if they don't exist
manadart
requested changes
Jan 10, 2022
manadart
reviewed
Jan 13, 2022
| for scope in ordered_scopes: | ||
| for address in addresses: | ||
| if scope == address['scope']: | ||
| ordered_addresses.append(address) |
manadart
approved these changes
Jan 13, 2022
|
!!build!! |
|
@juanmanuel-tirado The problems in the CI are known intermittent problems (i.e. not related to this PR), you can go ahead and merge this 👍 |
jujubot
added a commit
that referenced
this pull request
Jan 31, 2022
#619 ## What's Changed * [JUJU-320] Unit public address by @SimonRichardson in #600 * [JUJU-244] Add attach-resource by @cderici in #601 * [JUJU-140] Model.wait_for_idle -- for apps with no units yet by @cderici in #575 * [JUJU-367] Improve `get_charm_series` to check the model for series for a local charm by @cderici in #607 * [JUJU-366] Utility for connecting directly to existing connection by @cderici in #605 * Use public-address key instead of public_address by @wolsen in #610 * [JUJU-376] `wait_for_idle` to support scale down by @cderici in #613 * [JUJU-378] Utility for block_until-ing with a custom coroutine by @cderici in #614 * Fallback to 'local-fan' by @dparv in #612 * Minor comments on docs for block_until related functions. by @juanmanuel-tirado in #617 * Additional checks in print status. by @juanmanuel-tirado in #622 ## New Contributors * @wolsen made their first contribution in #610 * @dparv made their first contribution in #612 [JUJU-320]: https://warthogs.atlassian.net/browse/JUJU-320?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-244]: https://warthogs.atlassian.net/browse/JUJU-244?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-140]: https://warthogs.atlassian.net/browse/JUJU-140?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-367]: https://warthogs.atlassian.net/browse/JUJU-367?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-366]: https://warthogs.atlassian.net/browse/JUJU-366?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-376]: https://warthogs.atlassian.net/browse/JUJU-376?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-378]: https://warthogs.atlassian.net/browse/JUJU-378?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
zxhdaze
pushed a commit
to canonical/juju-backup-all
that referenced
this pull request
Apr 25, 2024
This is specifically to include juju/python-libjuju#612, available since 2.9.6. Reviewed-on: https://code.launchpad.net/~canonical-bootstack-cre/juju-backup-all/+git/juju-backup-all/+merge/421844 Reviewed-by: Peter Sabaini <peter.sabaini@canonical.com> Reviewed-by: Ksawery Dziekoński <xav.dziekonski@canonical.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.
If 'public' or 'local-cloud' are missing from the unit data, fallback to
'local-fan', in case of containers using solely fan networking and no
provider network.
Fixes #611