openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Fix parameter_defaults for nova less deploy"

This commit is contained in:
Zuul 2020-07-28 14:57:46 +00:00 committed by Gerrit Code Review
parent 67d78a753c d958b45ebb
commit 83bb2e3f03
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleo_ansible/ansible_plugins/module_utils/baremetal_deploy.py
View File

@ -187,7 +187,7 @@ def expand(roles, stack_name, expand_provisioned=True, default_image=None,
# NOTE(dtantsur): our hostname format may differ from THT defaults, # NOTE(dtantsur): our hostname format may differ from THT defaults,
# so override it in the resulting environment # so override it in the resulting environment
parameter_defaults['%sDeployedServerHostnameFormat' % name] = ( parameter_defaults['%sHostnameFormat' % name] = (
hostname_format) hostname_format)
# ensure each instance has a unique non-empty hostname # ensure each instance has a unique non-empty hostname
@ -233,7 +233,7 @@ def expand(roles, stack_name, expand_provisioned=True, default_image=None,
if provisioned == expand_provisioned: if provisioned == expand_provisioned:
instances.append(inst) instances.append(inst)
parameter_defaults['%sDeployedServerCount' % name] = ( parameter_defaults['%sCount' % name] = (
provisioned_count) provisioned_count)
validate_instances(instances) validate_instances(instances)

48
tripleo_ansible/tests/plugins/module_utils/test_baremetal_deploy.py
View File

@ -80,12 +80,12 @@ class TestExpandRoles(base.TestCase):
instances) instances)
self.assertEqual( self.assertEqual(
{ {
'ComputeDeployedServerHostnameFormat': 'ComputeHostnameFormat':
'%stackname%-novacompute-%index%', '%stackname%-novacompute-%index%',
'ComputeDeployedServerCount': 1, 'ComputeCount': 1,
'ControllerDeployedServerHostnameFormat': 'ControllerHostnameFormat':
'%stackname%-controller-%index%', '%stackname%-controller-%index%',
'ControllerDeployedServerCount': 1, 'ControllerCount': 1,
'HostnameMap': { 'HostnameMap': {
'overcloud-novacompute-0': 'overcloud-novacompute-0', 'overcloud-novacompute-0': 'overcloud-novacompute-0',
'overcloud-controller-0': 'overcloud-controller-0' 'overcloud-controller-0': 'overcloud-controller-0'
@ -172,12 +172,12 @@ class TestExpandRoles(base.TestCase):
instances) instances)
self.assertEqual( self.assertEqual(
{ {
'ComputeDeployedServerHostnameFormat': 'ComputeHostnameFormat':
'compute-%index%.example.com', 'compute-%index%.example.com',
'ComputeDeployedServerCount': 2, 'ComputeCount': 2,
'ControllerDeployedServerHostnameFormat': 'ControllerHostnameFormat':
'controller-%index%.example.com', 'controller-%index%.example.com',
'ControllerDeployedServerCount': 3, 'ControllerCount': 3,
'HostnameMap': { 'HostnameMap': {
'compute-0.example.com': 'compute-0.example.com', 'compute-0.example.com': 'compute-0.example.com',
'compute-1.example.com': 'compute-1.example.com', 'compute-1.example.com': 'compute-1.example.com',
@ -232,12 +232,12 @@ class TestExpandRoles(base.TestCase):
instances) instances)
self.assertEqual( self.assertEqual(
{ {
'ComputeDeployedServerHostnameFormat': 'ComputeHostnameFormat':
'compute-%index%.example.com', 'compute-%index%.example.com',
'ComputeDeployedServerCount': 2, 'ComputeCount': 2,
'ControllerDeployedServerHostnameFormat': 'ControllerHostnameFormat':
'%stackname%-controller-%index%', '%stackname%-controller-%index%',
'ControllerDeployedServerCount': 2, 'ControllerCount': 2,
'HostnameMap': { 'HostnameMap': {
'compute-0.example.com': 'compute-0.example.com', 'compute-0.example.com': 'compute-0.example.com',
'compute-1.example.com': 'compute-1.example.com', 'compute-1.example.com': 'compute-1.example.com',
@ -300,11 +300,11 @@ class TestExpandRoles(base.TestCase):
}], }],
instances) instances)
self.assertEqual({ self.assertEqual({
'ComputeDeployedServerCount': 2, 'ComputeCount': 2,
'ComputeDeployedServerHostnameFormat': 'ComputeHostnameFormat':
'compute-%index%.example.com', 'compute-%index%.example.com',
'ControllerDeployedServerCount': 3, 'ControllerCount': 3,
'ControllerDeployedServerHostnameFormat': 'ControllerHostnameFormat':
'%stackname%-controller-%index%', '%stackname%-controller-%index%',
'HostnameMap': { 'HostnameMap': {
'compute-0.example.com': 'compute-0.example.com', 'compute-0.example.com': 'compute-0.example.com',
@ -345,11 +345,11 @@ class TestExpandRoles(base.TestCase):
}], }],
instances) instances)
self.assertEqual({ self.assertEqual({
'ControllerDeployedServerCount': 2, 'ControllerCount': 2,
'ControllerRemovalPolicies': [ 'ControllerRemovalPolicies': [
{'resource_list': [1, 2]} {'resource_list': [1, 2]}
], ],
'ControllerDeployedServerHostnameFormat': 'ControllerHostnameFormat':
'%stackname%-controller-%index%', '%stackname%-controller-%index%',
'HostnameMap': { 'HostnameMap': {
'overcloud-controller-0': 'overcloud-controller-0', 'overcloud-controller-0': 'overcloud-controller-0',
@ -413,11 +413,11 @@ class TestExpandRoles(base.TestCase):
}], }],
instances) instances)
self.assertEqual({ self.assertEqual({
'ControllerDeployedServerCount': 4, 'ControllerCount': 4,
'ControllerRemovalPolicies': [ 'ControllerRemovalPolicies': [
{'resource_list': [1, 2]} {'resource_list': [1, 2]}
], ],
'ControllerDeployedServerHostnameFormat': 'ControllerHostnameFormat':
'%stackname%-controller-%index%', '%stackname%-controller-%index%',
'HostnameMap': { 'HostnameMap': {
'overcloud-controller-0': 'overcloud-controller-0', 'overcloud-controller-0': 'overcloud-controller-0',
@ -486,11 +486,11 @@ class TestExpandRoles(base.TestCase):
}], }],
instances) instances)
self.assertEqual({ self.assertEqual({
'ControllerDeployedServerCount': 2, 'ControllerCount': 2,
'ControllerRemovalPolicies': [ 'ControllerRemovalPolicies': [
{'resource_list': [1, 2]} {'resource_list': [1, 2]}
], ],
'ControllerDeployedServerHostnameFormat': 'ControllerHostnameFormat':
'%stackname%-controller-%index%', '%stackname%-controller-%index%',
'HostnameMap': { 'HostnameMap': {
'overcloud-controller-0': 'controller-0', 'overcloud-controller-0': 'controller-0',
@ -555,11 +555,11 @@ class TestExpandRoles(base.TestCase):
}], }],
instances) instances)
self.assertEqual({ self.assertEqual({
'ControllerDeployedServerCount': 2, 'ControllerCount': 2,
'ControllerRemovalPolicies': [ 'ControllerRemovalPolicies': [
{'resource_list': [1, 2]} {'resource_list': [1, 2]}
], ],
'ControllerDeployedServerHostnameFormat': 'ControllerHostnameFormat':
'%stackname%-controller-%index%', '%stackname%-controller-%index%',
'HostnameMap': { 'HostnameMap': {
'overcloud-controller-0': 'node-0', 'overcloud-controller-0': 'node-0',