Merge lp:~raharper/curtin/trunk.remove-force-centos-curthooks-flag into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

vmtests: Remove force flag for centos curthooks

[Ryan Harper (raharper)]

This can land after we confirm the centos images have updated their image with this change:

https://code.launchpad.net/~smoser/maas-images/trunk.fix-apply-networking/+merge/328467

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:516
https://jenkins.ubuntu.com/server/job/curtin-ci/579/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/579
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/579
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/579
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/579
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/579

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/579/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

Might as well remove the other hunk too ?
 curtin/commands/curthooks.py

or leave that as commented out in that file... ie, if you're going to leave old code in one part might as well leave a reference to it where it came from so a grep would find something.

I'm fine with either leaving a comment in centos_defaults.yaml or ripping them both out.

review: Needs Information

[Ryan Harper (raharper)]

On Thu, Aug 3, 2017 at 7:29 AM, Scott Moser <email address hidden> wrote:

> Review: Needs Information
>
> Might as well remove the other hunk too ?
> curtin/commands/curthooks.py'
>

Hrm, yes, it's possible we'd want to force running them at some point so
worth leaving as comment. I'll update

>
> or leave that as commented out in that file... ie, if you're going to
> leave old code in one part might as well leave a reference to it where it
> came from so a grep would find something.
>
> I'm fine with either leaving a comment in centos_defaults.yaml or ripping
> them both out.
> --
> https://code.launchpad.net/~raharper/curtin/trunk.remove-
> force-centos-curthooks-flag/+merge/328471
> You are the owner of lp:~raharper/curtin/trunk.
> remove-force-centos-curthooks-flag.
>

[lp:~raharper/curtin/trunk.remove-force-centos-curthooks-flag]

517. By Ryan Harper on 2017-08-03

Update comments around use of _ammend_centos_curthooks

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:517
https://jenkins.ubuntu.com/server/job/curtin-ci/585/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/585
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/585
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/585
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/585
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/585

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/585/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

review: Approve

=== modified file 'curtin/commands/curthooks.py'
--- curtin/commands/curthooks.py	2017-08-02 17:50:40 +0000
+++ curtin/commands/curthooks.py	2017-08-03 13:56:09 +0000
@@ -911,8 +911,8 @@
 
     # if curtin-hooks hook exists in target we can defer to the in-target hooks
     if util.run_hook_if_exists(target, 'curtin-hooks'):
-        # FIXME: For testing only until maas images have curthooks
-        # that utilize centos_apply_network_config.
+        # For vmtests to force execute centos_apply_network_config, uncomment
+        # the value in examples/tests/centos_defaults.yaml
         if cfg.get('_ammend_centos_curthooks'):
             if cfg.get('cloudconfig'):
                 handle_cloudconfig(

=== modified file 'examples/tests/centos_defaults.yaml'
--- examples/tests/centos_defaults.yaml	2017-08-01 15:47:35 +0000
+++ examples/tests/centos_defaults.yaml	2017-08-03 13:56:09 +0000
@@ -1,9 +1,8 @@
 hook_commands:
     builtin: null
 
-# Force curtin to run centos_apply_network_config vmtest
-# FIXME: Remove this after maas images no longer need it.
-_ammend_centos_curthooks: True
+# To force curtin to run centos_apply_network_config vmtest, uncomment
+# _ammend_centos_curthooks: True
 
 write_files:
   grub_serial_console: