From b3ec4209ad6f7c212da78c968133da8431a5c9f4 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 29 Jul 2020 09:46:34 +1200 Subject: [PATCH] Fix parameter_defaults for nova less deploy We seem to be using incorrect parameters for HostnameFormat and Count when generating environment for nova less deploy. It's always {{role.name}}Count and {{role.name}}HostnameFormat (adapted from tripleo-ansible commit d958b45ebbc986e8381a540f69508e8f91f13081) Change-Id: Ied6dbd349924db58f6323b878b8ee2e070d8719f --- tripleo_common/actions/baremetal_deploy.py | 4 +- .../tests/actions/test_baremetal_deploy.py | 48 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tripleo_common/actions/baremetal_deploy.py b/tripleo_common/actions/baremetal_deploy.py index 0228fe6af..9dfdd452c 100644 --- a/tripleo_common/actions/baremetal_deploy.py +++ b/tripleo_common/actions/baremetal_deploy.py @@ -422,7 +422,7 @@ class ExpandRolesAction(base.TripleOAction): # NOTE(dtantsur): our hostname format may differ from THT defaults, # so override it in the resulting environment - parameter_defaults['%sDeployedServerHostnameFormat' % name] = ( + parameter_defaults['%sHostnameFormat' % name] = ( hostname_format) # ensure each instance has a unique non-empty hostname @@ -468,7 +468,7 @@ class ExpandRolesAction(base.TripleOAction): if provisioned == self.provisioned: instances.append(inst) - parameter_defaults['%sDeployedServerCount' % name] = ( + parameter_defaults['%sCount' % name] = ( provisioned_count) try: diff --git a/tripleo_common/tests/actions/test_baremetal_deploy.py b/tripleo_common/tests/actions/test_baremetal_deploy.py index de3a4c195..5bb618434 100644 --- a/tripleo_common/tests/actions/test_baremetal_deploy.py +++ b/tripleo_common/tests/actions/test_baremetal_deploy.py @@ -664,12 +664,12 @@ class TestExpandRoles(base.TestCase): result['instances']) self.assertEqual( { - 'ComputeDeployedServerHostnameFormat': + 'ComputeHostnameFormat': '%stackname%-novacompute-%index%', - 'ComputeDeployedServerCount': 1, - 'ControllerDeployedServerHostnameFormat': + 'ComputeCount': 1, + 'ControllerHostnameFormat': '%stackname%-controller-%index%', - 'ControllerDeployedServerCount': 1, + 'ControllerCount': 1, 'HostnameMap': { 'overcloud-novacompute-0': 'overcloud-novacompute-0', 'overcloud-controller-0': 'overcloud-controller-0' @@ -743,12 +743,12 @@ class TestExpandRoles(base.TestCase): result['instances']) self.assertEqual( { - 'ComputeDeployedServerHostnameFormat': + 'ComputeHostnameFormat': 'compute-%index%.example.com', - 'ComputeDeployedServerCount': 2, - 'ControllerDeployedServerHostnameFormat': + 'ComputeCount': 2, + 'ControllerHostnameFormat': 'controller-%index%.example.com', - 'ControllerDeployedServerCount': 3, + 'ControllerCount': 3, 'HostnameMap': { 'compute-0.example.com': 'compute-0.example.com', 'compute-1.example.com': 'compute-1.example.com', @@ -802,12 +802,12 @@ class TestExpandRoles(base.TestCase): result['instances']) self.assertEqual( { - 'ComputeDeployedServerHostnameFormat': + 'ComputeHostnameFormat': 'compute-%index%.example.com', - 'ComputeDeployedServerCount': 2, - 'ControllerDeployedServerHostnameFormat': + 'ComputeCount': 2, + 'ControllerHostnameFormat': '%stackname%-controller-%index%', - 'ControllerDeployedServerCount': 2, + 'ControllerCount': 2, 'HostnameMap': { 'compute-0.example.com': 'compute-0.example.com', 'compute-1.example.com': 'compute-1.example.com', @@ -869,11 +869,11 @@ class TestExpandRoles(base.TestCase): }], result['instances']) self.assertEqual({ - 'ComputeDeployedServerCount': 2, - 'ComputeDeployedServerHostnameFormat': + 'ComputeCount': 2, + 'ComputeHostnameFormat': 'compute-%index%.example.com', - 'ControllerDeployedServerCount': 3, - 'ControllerDeployedServerHostnameFormat': + 'ControllerCount': 3, + 'ControllerHostnameFormat': '%stackname%-controller-%index%', 'HostnameMap': { 'compute-0.example.com': 'compute-0.example.com', @@ -913,11 +913,11 @@ class TestExpandRoles(base.TestCase): }], result['instances']) self.assertEqual({ - 'ControllerDeployedServerCount': 2, + 'ControllerCount': 2, 'ControllerRemovalPolicies': [ {'resource_list': [1, 2]} ], - 'ControllerDeployedServerHostnameFormat': + 'ControllerHostnameFormat': '%stackname%-controller-%index%', 'HostnameMap': { 'overcloud-controller-0': 'overcloud-controller-0', @@ -980,11 +980,11 @@ class TestExpandRoles(base.TestCase): }], result['instances']) self.assertEqual({ - 'ControllerDeployedServerCount': 4, + 'ControllerCount': 4, 'ControllerRemovalPolicies': [ {'resource_list': [1, 2]} ], - 'ControllerDeployedServerHostnameFormat': + 'ControllerHostnameFormat': '%stackname%-controller-%index%', 'HostnameMap': { 'overcloud-controller-0': 'overcloud-controller-0', @@ -1052,11 +1052,11 @@ class TestExpandRoles(base.TestCase): }], result['instances']) self.assertEqual({ - 'ControllerDeployedServerCount': 2, + 'ControllerCount': 2, 'ControllerRemovalPolicies': [ {'resource_list': [1, 2]} ], - 'ControllerDeployedServerHostnameFormat': + 'ControllerHostnameFormat': '%stackname%-controller-%index%', 'HostnameMap': { 'overcloud-controller-0': 'controller-0', @@ -1120,11 +1120,11 @@ class TestExpandRoles(base.TestCase): }], result['instances']) self.assertEqual({ - 'ControllerDeployedServerCount': 2, + 'ControllerCount': 2, 'ControllerRemovalPolicies': [ {'resource_list': [1, 2]} ], - 'ControllerDeployedServerHostnameFormat': + 'ControllerHostnameFormat': '%stackname%-controller-%index%', 'HostnameMap': { 'overcloud-controller-0': 'node-0',