Merge "Revert "Remove masquerade-networks-baremetal-puppet inclusion""

releasenotes/notes/hiera-override-masquerade-e17bdf22c94aad2f.yaml

@@ -1,11 +0,0 @@
----
-upgrade:
-  - |
-    The operator cannot override the masquerade_networks using
-    hieradata_override in the undercloud.conf.
-    They now must provide a custom env file, using custom_env_file and passing
-    the hash through MasqueradeNetworks parameter.
-deprecations:
-  - |
-    hieradata "tripleo::masquerade_networks::masquerade_networks" has no
-    effect anymore.

tripleoclient/tests/v1/undercloud/test_install_upgrade.py

@@ -353,6 +353,9 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'use-dns-for-vips.yaml', '-e',
              '/home/stack/foo.yaml', '-e',
+             '/usr/share/openstack-tripleo-heat-templates/'
+             'environments/services/masquerade-networks.yaml',
+             '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/ironic.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'

tripleoclient/v1/undercloud_config.py

@@ -587,6 +587,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
     # later into other deployment artifacts and user-provided files.
     _container_images_config(CONF, deploy_args, env_data, tempdir)
 
+    if env_data['MasqueradeNetworks']:
+        deploy_args += ['-e', os.path.join(
+            tht_templates, "environments/services/masquerade-networks.yaml")]
+
     if CONF.get('enable_keystone'):
         deploy_args += ['-e', os.path.join(
             tht_templates, "environments/undercloud-enable-keystone.yaml")]