Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ jobs:
- bosh-config/operations/add-cloud-gov-root-certificate.yml
- bosh-config/operations/nats-payload.yml
- bosh-config/operations/root-disk.yml
- bosh-config/operations/tooling-bosh-awslogs.yml
Copy link
Contributor

Choose a reason for hiding this comment

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

I assume we can delete tooling-bosh-awslogs then?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup, once this gets tested out in dev, I'll make another PR to pull the temporary ops file.

- bosh-config/operations/aws-cli-v2.yml
vars_files:
- bosh-config/variables/tooling.yml
- terraform-secrets/terraform.yml
Expand Down
19 changes: 19 additions & 0 deletions operations/aws-cli-v2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: replace
path: /instance_groups/name=bosh/jobs/-
value:
name: pre-start-script
release: os-conf
properties:
script: |
#!/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this a pretty standard way to do things in BOSH?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is a workaround for now, if we get time to make a full bosh release for this, or can find another donor release, we can do that.

We use os-conf release for a number of odds-n-ends installs

mkdir /var/vcap/data/aws-cli-v2
chown root:vcap /var/vcap/data/aws-cli-v2
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
unzip awscliv2.zip
./aws/install --install-dir /var/vcap/data/aws-cli-v2
- type: replace
path: /releases/-
value:
name: os-conf
version: latest
3 changes: 1 addition & 2 deletions operations/cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
# apps from other packages on this host we need
PSQL=/var/vcap/packages/postgres-client/bin/psql

AWSCLI=/var/vcap/packages/awslogs-jammy/venv/bin/aws
export LD_LIBRARY_PATH=/var/vcap/packages/awslogs-jammy/venv/lib
AWSCLI=/var/vcap/data/aws-cli-v2/v2/current/bin/aws

# Hack: look up push gateway address in database if gateway is managed by the current director
if [ -n "${GATEWAY_DEPLOYMENT}" ]; then
Expand Down