Add egress-address to relation data #7818

Merged
merged 2 commits into from Sep 1, 2017

Conversation

Projects
None yet
3 participants
Owner

wallyworld commented Sep 1, 2017

Description of change

Add egress-subnets to relation data.
Also delete some old incorrect code for determining the ingress-address.

The second commit adds an admin override option when saving relation networks. This sets up the state data model for later use, allowing an admin to control what ingress rules are used for a given relation.

QA steps

smoke test CMR scenario

axw approved these changes Sep 1, 2017

@@ -245,7 +245,8 @@ func (w *EgressAddressWatcher) loop() error {
}
}
-func formatAsCIDR(addresses []string) []string {
+// FormatAsCIDR formats the specified IP address as a CIDR.
@axw

axw Sep 1, 2017

Member

... IP addresses as CIDR.
?

@wallyworld

wallyworld Sep 1, 2017

Owner

reworded, hopefully makes sense now

Owner

wallyworld commented Sep 1, 2017

$$merge$$

Contributor

jujubot commented Sep 1, 2017

Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju

@jujubot jujubot merged commit c2a26df into juju:develop Sep 1, 2017

1 check passed

continuous-integration/jenkins/pr-merge This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment