Skip to content

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −0
Draft

Implement passing over an additional env file #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions devsetup/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ edpm_deploy_instance: ## Spin a instance on edpm node
.PHONY: tripleo_deploy
tripleo_deploy: export CLOUD_DOMAIN=${DNS_DOMAIN}
tripleo_deploy: export TLSE_ENABLED=${TLS_ENABLED}
tripleo_deploy: export TRIPLEO_ADDITIONAL_ENV=${ADDITIONAL_ENV_FILE}
tripleo_deploy: export INTERFACE_MTU=${NETWORK_MTU}
tripleo_deploy: export COMPUTE_CELLS=${EDPM_COMPUTE_CELLS}
tripleo_deploy: export REGISTRY_USER ?= ${RH_REGISTRY_USER}
Expand Down Expand Up @@ -524,6 +525,7 @@ standalone_deploy: export MANILA_ENABLED=${MANILA_SERVICE_ENABLED}
standalone_deploy: export HEAT_ENABLED=${HEAT_SERVICE_ENABLED}
standalone_deploy: export CLOUD_DOMAIN=${DNS_DOMAIN}
standalone_deploy: export COMPUTE_CEPH_ENABLED=${EDPM_COMPUTE_CEPH_ENABLED}
standalone_deploy: export STANDALONE_ADDITIONAL_ENV=${ADDITIONAL_ENV_FILE}
standalone_deploy: export CONFIGURE_HUGEPAGES=${EDPM_CONFIGURE_HUGEPAGES}
standalone_deploy: export COMPUTE_CEPH_NOVA=${EDPM_COMPUTE_CEPH_NOVA}
standalone_deploy: export COMPUTE_SRIOV_ENABLED=${EDPM_COMPUTE_SRIOV_ENABLED}
Expand Down
2 changes: 2 additions & 0 deletions devsetup/scripts/standalone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ export BARBICAN_ENABLED=${BARBICAN_ENABLED}
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

@vakwetu vakwetu Nov 18, 2025

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 CLOUD_DOMAIN=${CLOUD_DOMAIN}
export OCTAVIA_ENABLED=${OCTAVIA_ENABLED}
export HEAT_ENABLED=${HEAT_ENABLED}
Expand Down Expand Up @@ -236,6 +237,7 @@ scp $SSH_OPT ${SCRIPTPATH}/../standalone/hugepages.yaml root@$IP:hugepages.yaml
[[ "$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

@vakwetu vakwetu Nov 18, 2025

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

@vakwetu vakwetu Nov 18, 2025

Choose a reason for hiding this comment

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

again, note the typo.

[ -f $HOME/.ssh/id_ecdsa.pub ] || \
ssh-keygen -t ecdsa -f $HOME/.ssh/id_ecdsa -q -N ""
scp $SSH_OPT $HOME/.ssh/id_ecdsa.pub root@$IP:/root/.ssh/id_ecdsa.pub
Expand Down
2 changes: 2 additions & 0 deletions devsetup/scripts/tripleo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export MANILA_ENABLED=${MANILA_ENABLED:-true}
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

@vakwetu vakwetu Nov 18, 2025

Choose a reason for hiding this comment

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

ditto as above

export CLOUD_DOMAIN=${CLOUD_DOMAIN:-localdomain}
export TRIPLEO_NETWORKING=${TRIPLEO_NETWORKING:-true}
export TRIPLEO_ATTACH_EXTNET=${TRIPLEO_ATTACH_EXTNET:-true}
Expand Down Expand Up @@ -266,6 +267,7 @@ else
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

@vakwetu vakwetu Nov 18, 2025

Choose a reason for hiding this comment

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

ditto as above

if [[ "$EDPM_COMPUTE_CEPH_ENABLED" == "true" ]]; then
scp $SSH_OPT ${SCRIPTPATH}/../tripleo/ceph.sh root@$IP:/tmp/ceph.sh
scp $SSH_OPT ${SCRIPTPATH}/../tripleo/generate_ceph_inventory.py root@$IP:/tmp/generate_ceph_inventory.py
Expand Down
4 changes: 4 additions & 0 deletions devsetup/standalone/openstack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,8 @@ if [ "$EDPM_COMPUTE_DHCP_AGENT_ENABLED" = "true" ] ; then
ENV_ARGS+=" -e $HOME/dhcp_agent_template.yaml"
fi

if [ -f "${STANDALONE_ADDITIONAL_ENV}" ]; then
ENV_ARGS+=" -e ${STANDALONE_ADDITIONAL_ENV}"
fi

sudo ${CMD} ${CMD_ARGS} ${ENV_ARGS}
4 changes: 4 additions & 0 deletions devsetup/tripleo/tripleo_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ if [ "$EDPM_CONFIGURE_HUGEPAGES" = "true" ] && [ "$TLSE_ENABLED" != "true" ] ; t
ENV_ARGS+=" -e $HOME/hugepages.yaml"
fi

if [ -f "${TRIPLEO_ADDITIONAL_ENV}" ]; then
ENV_ARGS+=" -e ${TRIPLEO_ADDITIONAL_ENV}"
fi

if [ "$TLSE_ENABLED" = "true" ]; then
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/ssl/tls-everywhere-endpoints-dns.yaml"
ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/services/haproxy-public-tls-certmonger.yaml"
Expand Down