Skip to content

Conversation

@xek
Copy link
Contributor

@xek xek commented Sep 24, 2025

Enable passing an additional heat environment file
to the standalone or tripleo deploy scripts.

Jira: https://issues.redhat.com/browse/OSPRH-19960

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 24, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 24, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: xek
Once this PR has been reviewed and has the lgtm label, please assign abays for approval. For more information see the 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:

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
Copy link

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/caa7752529d844df8b46d672a5277978

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 41m 44s
✔️ install-yamls-crc-podified-edpm-baremetal SUCCESS in 1h 25m 23s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 20m 15s
adoption-standalone-to-crc-ceph-provider FAILURE in 39m 48s
adoption-standalone-to-crc-no-ceph-provider FAILURE in 37m 54s

@xek xek force-pushed the additional_heat_env branch from d6b8fd1 to e253402 Compare September 25, 2025 08:21
@softwarefactory-project-zuul
Copy link

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/6c1fa5f5d19a4a22bc09ea04ce4c873f

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 41m 26s
✔️ install-yamls-crc-podified-edpm-baremetal SUCCESS in 1h 28m 16s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 17m 18s
adoption-standalone-to-crc-ceph-provider FAILURE in 38m 23s
adoption-standalone-to-crc-no-ceph-provider FAILURE in 36m 37s

Enable passing an additional heat environment file
to the standalone or tripleo deploy scripts.
@xek xek force-pushed the additional_heat_env branch from e253402 to 6971c22 Compare September 26, 2025 14:52
export MANILA_ENABLED=${MANILA_ENABLED}
export SWIFT_REPLICATED=${SWIFT_REPLICATED}
export TLSE_ENABLED=${TLSE_ENABLED}
export STANDALONE_ADDITIONAL_ENV=/tmp/aditional_env_file.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't look right - shouldn't this just be set to the value of the env parameter you set in the Makefile

Like: STANDALONE_ADDITIONAL_ENV=${STANDALONE_ADDITIONAL_ENV}

If you want to put in a default value, please note the typo in the file name.

export OCTAVIA_ENABLED=${OCTAVIA_ENABLED}
export TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-true}
export TLSE_ENABLED=${TLSE_ENABLED:-false}
export TRIPLEO_ADDITIONAL_ENV=/tmp/aditional_env_file.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto as above

[[ "$EDPM_COMPUTE_CEPH_ENABLED" == "true" ]] && scp $SSH_OPT standalone/ceph.sh root@$IP:/tmp/ceph.sh
scp $SSH_OPT standalone/openstack.sh root@$IP:/tmp/openstack.sh
scp $SSH_OPT standalone/post_config/ironic.sh root@$IP:/tmp/ironic_post.sh
[ -f "${STANDALONE_ADDITIONAL_ENV}" ] && scp $SSH_OPT "${STANDALONE_ADDITIONAL_ENV}" root@$IP:/tmp/aditional_env_file.yaml || true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should the destination file name not be the same as the STANDALONE_ADDITIONAL_ENV ? (or at least the basename of that)?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, note the typo.

fi
scp $SSH_OPT ${SCRIPTPATH}/../tripleo/overcloud_roles.yaml zuul@$IP:overcloud_roles.yaml
scp $SSH_OPT ${SCRIPTPATH}/../tripleo/ansible_config.cfg zuul@$IP:ansible_config.cfg
[ -n "${TRIPLEO_ADDITIONAL_ENV}" ] && [ -f "${TRIPLEO_ADDITIONAL_ENV}" ] && scp $SSH_OPT "${TRIPLEO_ADDITIONAL_ENV}" zuul@$IP:/tmp/aditional_env_file.yaml || true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto as above

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants