2.3 into develop #8762
Merged
2.3 into develop #8762
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
When autodetecting FAN overlays, we were taking all SuperSubnets and mapping them, but we know that we don't want overlays for IPv6 networks. Openstack SuperSubnets always returns all subnets, and it isn't clear if SuperSubnets should be filtering v6. For Openstack subnet listings, we now only list the subnets that are part of either the 'network' config or the 'external-network' config, rather than listing all networks all the time. (This should address bug #1733266 until we have support for Openstack instances spanning multiple networks.)
…lines juju#8756 ## Description of change Status, in tabular output, displays information in different sections - applications, units, machines, relations, etc... Each section is separate from previous by a new line. If the section is empty, it will not be displayed. There are 2 ways to ensure that there is a new line - add one at the end of a section or add one at the beginning. As there is no guarantee that a section will be displayed, it is easier to ensure that a newline is present whenever a section is rendered. We know we'd be rendering a section when we are rendering headers. This PR ensures that all headers are preceded by a newline and removes redundant empty lines after sections that had them. Without this change, some sections will be separated by several newlines (I have seen 2); and others will have no newlines in between (for example, if there are only machines to display).
juju#8751 ## Description of change When autodetecting FAN overlays, we were taking all SuperSubnets and mapping them, but we know that we don't want overlays for IPv6 networks. Openstack SuperSubnets always returns all subnets, and it isn't clear if SuperSubnets should be filtering v6. For Openstack subnet listings, we now only list the subnets that are part of either the 'network' config or the 'external-network' config, rather than listing all networks all the time. (This should address bug #1733266 until we have support for Openstack instances spanning multiple networks.) ## QA steps For the first one, we should be able to `juju bootstrap` on an Openstack that has IPv6 subnets. (Or on any provider with IPv6, for that matter.) For the second one, we should be able to `juju bootstrap` on an Openstack as long as you supply --config="network=XXXXX", even if that Openstack defines several networks with subnets that collide. ## Documentation changes None. ## Bug reference https://bugs.launchpad.net/bugs/1761706 https://bugs.launchpad.net/bugs/1733266
Since this was a 'manual forward port of ...' assume that the content is exactly what was desired and just favor develop over all of 2.3 changes.
This brings in: juju#8751
|
|
|
|
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.
Description of change
This includes my change to the Openstack provider to avoid duplicate subnet ranges by only including subnets that are part of the networks that you provide in config.
This also includes a no-op merge of Anastasia's change to status, since she had already independently merged a change to develop.
QA steps
See individual patches.
Documentation changes
None.
Bug reference