← Back to branch summary

~allenap/maas/rpc-give-shared-secret-to-accepted-cluster

« back to all changes in this revision

Viewing changes to src/provisioningserver/import_images/tests/test_config.py

  • Committer: Tarmac
  • Author(s): jtv at canonical
  • Date: 2013-10-08 11:44:11 UTC
  • mfrom: (1671.3.2 drop-target-name-prefix)
  • Revision ID: tarmac-20131008114411-wbfgpqryj5q8ac62
[r=allenap][bug=][author=jtv] Drop target_name_prefix setting from ephemerals import script.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/import_images/tests/test_config.py
155
155
            'DATA_DIR': factory.getRandomString(),
156
156
            'ARCHES': "'%s'" % ' '.join(arches),
157
157
            'RELEASES': "'%s'" % ' '.join(releases),
158
 
            'TARGET_NAME_PREFIX': factory.getRandomString(),
159
158
        }
160
159
        make_legacy_config(self, legacy_options)
161
160
        config = {'boot': {'ephemeral': {}}}
168
167
                'directory': legacy_options['DATA_DIR'],
169
168
                'arches': ' '.join(arches),
170
169
                'releases': ' '.join(releases),
171
 
                'target_name_prefix': legacy_options['TARGET_NAME_PREFIX'],
172
170
            },
173
171
            config['boot']['ephemeral'])
174
172
 
179
177
            'directory': factory.getRandomString(),
180
178
            'arches': factory.make_name('arch'),
181
179
            'releases': factory.make_name('release'),
182
 
            'target_name_prefix': factory.getRandomString(),
183
180
            })
184
181
 
185
182
        changed = merge_legacy_ephemerals_config(config)