Enable image-based provisioning for 6.0 upgrades

This fix has been lost during the process of
migration of cluster data manipulation functionality
from the octane to this extension.

Change-Id: Ife92cbd0e8d8f8376ffcb1f333d1fac9e911ff3e
Closes-bug: 1573100
This commit is contained in:
Dmitry Nikishov 2016-12-02 14:39:09 +03:00
parent 40315ce69d
commit 89839b88c3
3 changed files with 18 additions and 5 deletions

View File

@ -238,11 +238,16 @@ class TestClusterTransformers(nailgun_test_base.BaseUnitTest):
def test_manager(self):
man = cluster.Manager() # verify default config and entry points
self.assertEqual(man.transformers, [(version.StrictVersion('9.0'), [
cluster.transform_dns_list,
cluster.transform_ntp_list,
cluster.drop_generated_provision,
])])
self.assertEqual(man.transformers, [
(version.StrictVersion('6.1'), [
cluster.enable_ibp,
]),
(version.StrictVersion('9.0'), [
cluster.transform_dns_list,
cluster.transform_ntp_list,
cluster.drop_generated_provision,
])
])
class TestVipTransformers(nailgun_test_base.BaseUnitTest):

View File

@ -45,8 +45,14 @@ def drop_generated_provision(data):
return data
def enable_ibp(data):
data['editable']['provision']['method']['value'] = 'image'
return data
class Manager(transformations.Manager):
default_config = {
'9.0': ['dns_list', 'ntp_list', 'drop_provision'],
'6.1': ['image_provision'],
}
name = 'cluster'

View File

@ -26,6 +26,8 @@ nailgun.extensions =
cluster_upgrade = cluster_upgrade.extension:ClusterUpgradeExtension
nailgun.cluster_upgrade.transformations.volumes.6.1 =
node_volumes = cluster_upgrade.transformations.volumes:transform_node_volumes
nailgun.cluster_upgrade.transformations.cluster.6.1 =
image_provision = cluster_upgrade.transformations.cluster:enable_ibp
nailgun.cluster_upgrade.transformations.cluster.9.0 =
dns_list = cluster_upgrade.transformations.cluster:transform_dns_list
ntp_list = cluster_upgrade.transformations.cluster:transform_ntp_list