Merge ~andybotting/cloud-init:openstack-disable-ipv4-on-config into cloud-init:master

Proposed by Andy Botting
Status: Rejected
Rejected by: Ryan Harper
Proposed branch: ~andybotting/cloud-init:openstack-disable-ipv4-on-config
Merge into: cloud-init:master
Diff against target: 15 lines (+4/-0)
1 file modified
cloudinit/sources/DataSourceOpenStack.py (+4/-0)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Chad Smith Pending
Review via email: mp+364847@code.launchpad.net

Commit message

Disable ephemeral ip setup for OpenStack on config

If apply_network_config is set to False on the OpenStack
datastore, we should not attempt to configure the ephemeral ipv4
address for fetching networking config.

LP: #1821102

To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) wrote :

I've pointed CI at this MP.

Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:e43b10a4aad20c0596d3cc7a00d75dd7aae60ea7
https://jenkins.ubuntu.com/server/job/cloud-init-ci/778/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/778/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) wrote :

I'm marking this branch as "rejected" as we've an alternative approach which resolves the bug. It's a bit harsh in the language but it allows to know that this branch no longer needs review.

The alternative resolution is here:

https://code.launchpad.net/~raharper/cloud-init/+git/cloud-init/+merge/368553

Revision history for this message
Andy Botting (andybotting) wrote :

That RFC3442 route parsing code is very "interesting" :) Thanks for your help!

Unmerged commits

e43b10a... by Andy Botting on 2019-03-20

Disable ephemeral ipv4 setup for OpenStack on config

If apply_network_config is set to False on the OpenStack
datastore, we should not attempt to configure the ephemeral ipv4
address for fetching networking config.

LP: #1821102

Update scan failed

At least one of the branches involved have failed to scan. You can manually schedule a rescan if required.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py
2index 4a01524..8214641 100644
3--- a/cloudinit/sources/DataSourceOpenStack.py
4+++ b/cloudinit/sources/DataSourceOpenStack.py
5@@ -127,6 +127,10 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
6 return False
7
8 if self.perform_dhcp_setup: # Setup networking in init-local stage.
9+ # Don't setup ephemeral networking if apply_network_config is false
10+ if util.is_false(self.ds_cfg.get('apply_network_config', True)):
11+ LOG.debug("skipping ephemeral ipv4 setup")
12+ return False
13 try:
14 with EphemeralDHCPv4(self.fallback_interface):
15 results = util.log_time(

Subscribers

People subscribed via source and target branches