-
Notifications
You must be signed in to change notification settings - Fork 114
Implement passing over an additional env file #1093
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
|
Skipping CI for Draft Pull Request. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: xek 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 |
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/caa7752529d844df8b46d672a5277978 ✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 41m 44s |
d6b8fd1 to
e253402
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/6c1fa5f5d19a4a22bc09ea04ce4c873f ✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 41m 26s |
Enable passing an additional heat environment file to the standalone or tripleo deploy scripts.
e253402 to
6971c22
Compare
| export MANILA_ENABLED=${MANILA_ENABLED} | ||
| export SWIFT_REPLICATED=${SWIFT_REPLICATED} | ||
| export TLSE_ENABLED=${TLSE_ENABLED} | ||
| export STANDALONE_ADDITIONAL_ENV=/tmp/aditional_env_file.yaml |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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)?
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto as above
Enable passing an additional heat environment file
to the standalone or tripleo deploy scripts.
Jira: https://issues.redhat.com/browse/OSPRH-19960