Merge lp:~ltrager/maas-images/lp1791189 into lp:maas-images

[Lee Trager]

Centos7: do not run finalize hook if curtin supports centos.

If curtin has the feature CENTOS_CURTHOOK_SUPPORT, then do not run
the 'finalize' hook, but let curtin handle it.

The finalize CentOS hook writes the MAAS OAUTH credentials to
90_datasource.cfg. The builtin Curtin hooks are writing the MAAS OAUTH
credentials to 50-cloudconfig-maas-reporting.cfg. Disable the finalize
hook when Curtin supports CENTOS_CURTHOOK_SUPPORT to avoid duplicated
data.

[Scott Moser (smoser)]

i re-formatted your description to be 74 chars wide and re-worded the subject line a bit.

please use that hwen you land and feel free to do so.

review: Approve

=== modified file 'curtin/centos7/finalize.py'
--- curtin/centos7/finalize.py	2016-05-11 18:47:46 +0000
+++ curtin/centos7/finalize.py	2018-09-13 08:14:17 +0000
@@ -11,6 +11,10 @@
 import sys
 
 from curtin import util
+try:
+    from curtin import FEATURES as curtin_features
+except ImportError:
+    curtin_features = []
 
 
 DATASOURCE_LIST = """\
@@ -74,6 +78,11 @@
 
 
 def main():
+    # The builtin Curtin hooks handle writing the datasource as
+    # 50-cloudconfig-maas-reporting.cfg. Running this creates duplicated data
+    # at 90_datasource.cfg.
+    if 'CENTOS_CURTHOOK_SUPPORT' in curtin_features:
+        return
     state = util.load_command_environment()
     target = state['target']
     if target is None: