Fixes whitespaces and newline in nova conf template

[auniyal61]

• remove extra newlines
• format if else pattern

This is a followup patch for #823

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: auniyal61
Once this PR has been reviewed and has the lgtm label, please assign lewisdenny for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[softwarefactory-project-zuul]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/9169b5f8dc614120bf2905d657c94b5c

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 31m 03s
❌ nova-operator-kuttl FAILURE in 45m 17s
❌ nova-operator-tempest-multinode FAILURE in 1h 09m 52s
❌ nova-operator-tempest-multinode-ceph FAILURE in 1h 13m 02s

[SeanMooney]

This can work and it's what i originally tried and abandoned last year but I'm not sure we want to commit to doing this.

the other option that we briefly discussed was post-processing the template and removing any instance of multiple newlines with a single new line.

if we make this change using the template timing feature then i want an env test tests for this to assert we do not have multiple consecutive new lines to catch any template changes that may miss the trimming and reintroduce this issue.

[auniyal61]

he other option that we briefly discussed was post-processing the template and removing any instance of multiple newlines with a single new line.

yeah I tried that earlier, replaice "\n\n\n+" with "\n".

[auniyal61]

but I tried it in inside a test,
@SeanMooney can you please suggest if we go with this approach, at what place should we make final changes .

i.e once we are sure, final nova.conf(s) are ready to format.
I think the foratting is dones here, but not sure at what point/place nova-operator can update this.
https://github.com/openstack-k8s-operators/lib-common/blob/bd202c880706adfbcc64ee4a57e877503a274a69/modules/common/util/template_util.go#L138

[gibizer]

As the current output still has plenty of whitespace even after the template tunining I would suggest to try to reduce that as a post processing step as discussed here.

The utils.Template type we use to pass the template to lib-common already has optional flags like https://github.com/openstack-k8s-operators/lib-common/blob/0ae9f7f9e059a903b1c47119ed05aa509f8afb77/modules/common/util/template_util.go#L58 So I think it would be OK to add an optional postProcessing function callback to that type that gets the rendered text and return a new text. The default can be a simple identity that returns the text unchanged. Then nova-operator can hook into the lib-common code and do the whitespace reduction on the rendered text. (It would be even better to split up the monolithic secret.EnsureSecrets lib-common function that the template rendering and the secret creation can be composed on the client side.)

@auniyal61 you can put replace line into go.mod to depend on an unmerged lib-common patch to be able to show that the lib-common change works with nova-operator and to show how the config would look.

[auniyal61]

updated confs:
https://logserver.rdoproject.org/42/842/5d445068550973db0cb983d872891a089d9eb450/github-check/nova-operator-tempest-multinode/eeef79f/controller/ci-framework-data/logs/openstack-k8s-operators-openstack-must-gather/namespaces/openstack/secrets/nova/nova-cell0-conductor-config-data.yaml-01-nova.conf

[auniyal61]

current error:
Follow script's output here: /home/zuul/ci-framework-data/logs/ci_script_007_apply_the.log

'error: timed out waiting for the condition on openstackcontrolplanes/controlplane'

controlplane eventually get created
https://logserver.rdoproject.org/42/842/5d445068550973db0cb983d872891a089d9eb450/github-check/nova-operator-tempest-multinode/eeef79f/controller/ci-framework-data/logs/ci_script_007_apply_the.log
openstackcontrolplane.core.openstack.org/controlplane created

[softwarefactory-project-zuul]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/5603e783fdc541a194db8ca611038722

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 34m 58s
❌ nova-operator-kuttl FAILURE in 45m 36s
❌ nova-operator-tempest-multinode FAILURE in 1h 09m 49s
❌ nova-operator-tempest-multinode-ceph FAILURE in 1h 09m 40s

[gibizer]

Test failures are relevant:

argument --debug: Invalid Boolean value: truecompute_driver = fake.FakeDriver

https://softwarefactory-project.io/zuul/t/rdoproject.org/build/e62d1dc907464e9fb5a24a86d51ed22c/log/controller/ci-framework-data/logs/openstack-k8s-operators-openstack-must-gather/namespaces/nova-kuttl-default/pods/nova-kuttl-cell1-compute-fake1-compute-0/logs/nova-kuttl-cell1-compute-fake1-compute-compute-previous.log#26-27

https://softwarefactory-project.io/zuul/t/rdoproject.org/build/e62d1dc907464e9fb5a24a86d51ed22c/log/controller/ci-framework-data/logs/openstack-k8s-operators-openstack-must-gather/namespaces/nova-kuttl-default/secrets/nova/nova-kuttl-cell1-compute-fake1-compute-config-data.yaml-01-nova.conf#11

[gibizer]

cell0 db sync job fails probably due to the following config issue:

# rabbit_quorum_queue=true
heartbeat_in_pthread=false[conductor]
# scaling should be done by running more pods
workers=1

https://softwarefactory-project.io/zuul/t/rdoproject.org/build/534047eb110f4a11a856d72ef3abbd5f/log/controller/ci-framework-data/logs/openstack-k8s-operators-openstack-must-gather/namespaces/openstack/secrets/nova/nova-cell0-conductor-config-data.yaml-01-nova.conf#23

[auniyal61]

this is/will be done #857