Reorg directory structure:

This makes the deploy directory cleaner by moving all
compose related file/directories into the compose directory.

Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
This commit is contained in:
Jacob Weinstock 2021-08-08 11:39:08 -06:00
parent 9b1cf3b509
commit d6af9a49af
12 changed files with 17 additions and 17 deletions

10
.gitignore vendored
View File

@ -2,9 +2,9 @@ envrc
out
!deploy/.env
.vagrant
deploy/state/webroot/misc/osie/current/*
deploy/state/webroot/workflow/*
!deploy/state/webroot/misc/osie/current/.keep
!deploy/state/webroot/workflow/.keep
deploy/state/webroot/*.gz
deploy/compose/state/webroot/misc/osie/current/*
deploy/compose/state/webroot/workflow/*
!deploy/compose/state/webroot/misc/osie/current/.keep
!deploy/compose/state/webroot/workflow/.keep
deploy/compose/state/webroot/*.gz
workflow_id.txt

View File

@ -31,7 +31,7 @@ services:
entrypoint: /scripts/lastmile.sh
command: ["${OSIE_DOWNLOAD_URL}", "/source", "/source", "/destination"]
volumes:
- ${REPO_TOP_LEVEL:-.}/compose/osie:/scripts
- ${REPO_TOP_LEVEL:-.}/osie:/scripts
- ${REPO_TOP_LEVEL:-.}/state/webroot/misc/osie/current:/source
- ${REPO_TOP_LEVEL:-.}/state/webroot/workflow:/destination
@ -47,7 +47,7 @@ services:
"/registry/registry_images.txt",
]
volumes:
- ${REPO_TOP_LEVEL:-.}/compose/registry:/registry
- ${REPO_TOP_LEVEL:-.}/registry:/registry
depends_on:
registry:
condition: service_healthy
@ -83,7 +83,7 @@ services:
TINKERBELL_GRPC_AUTHORITY: tink-server:42113
TINKERBELL_CERT_URL: http://tink-server:42114/cert
volumes:
- ${REPO_TOP_LEVEL:-.}/compose/manifests:/manifests
- ${REPO_TOP_LEVEL:-.}/manifests:/manifests
depends_on:
tink-server:
condition: service_healthy
@ -101,7 +101,7 @@ services:
"/destination/focal-server-cloudimg-amd64.raw",
]
volumes:
- ${REPO_TOP_LEVEL:-.}/compose/ubuntu:/scripts
- ${REPO_TOP_LEVEL:-.}/ubuntu:/scripts
- ${REPO_TOP_LEVEL:-.}/state/webroot:/destination
tink-server:

View File

@ -35,12 +35,12 @@ Vagrant.configure("2") do |config|
# vagrant plugin install vagrant-docker-compose
override.vm.provision :docker_compose,
compose_version: "1.29.1",
yml: "/vagrant/docker-compose.yml",
yml: "/vagrant/compose/docker-compose.yml",
run:"always",
env: {
"TINKERBELL_HOST_IP": PROVISIONER_IP,
"TINKERBELL_CLIENT_IP": MACHINE1_IP,
"REPO_TOP_LEVEL": "/vagrant",
"REPO_TOP_LEVEL": "/vagrant/compose",
"TINKERBELL_HARDWARE_MANIFEST": "/manifests/hardware/hardware.json",
"TINKERBELL_TEMPLATE_MANIFEST": "/manifests/template/ubuntu.yaml"
}
@ -51,12 +51,12 @@ Vagrant.configure("2") do |config|
# vagrant plugin install vagrant-docker-compose
override.vm.provision :docker_compose,
compose_version: "1.29.1",
yml: "/vagrant/docker-compose.yml",
yml: "/vagrant/compose/docker-compose.yml",
run:"always",
env: {
"TINKERBELL_HOST_IP": PROVISIONER_IP,
"TINKERBELL_CLIENT_IP": MACHINE1_IP,
"REPO_TOP_LEVEL": "/vagrant",
"REPO_TOP_LEVEL": "/vagrant/compose",
"TINKERBELL_HARDWARE_MANIFEST": "/manifests/hardware/hardware-libvirt.json",
"TINKERBELL_TEMPLATE_MANIFEST": "/manifests/template/ubuntu-libvirt.yaml"
}

View File

@ -37,7 +37,7 @@ You will need to bring your own machines to provision.
4. Start the provisioner
```bash
cd deploy
cd deploy/compose
docker-compose up -d
# This process will take about 5-10 minutes depending on your internet connection.
# OSIE is about 2GB in size and the Ubuntu Focal image is about 500MB
@ -181,7 +181,7 @@ You will need to bring your own machines to provision.
```bash
# watch the workflow events and status for workflow completion
# once the workflow is complete (see the expected output below for completion), move on to the next step
wid=$(cat compose/manifests/workflow/workflow_id.txt); docker exec -it deploy_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
wid=$(cat manifests/workflow/workflow_id.txt); docker exec -it compose_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
```
<details>

View File

@ -231,7 +231,7 @@ This option will also show you how to create a machine to provision.
vagrant ssh provisioner
# watch the workflow events and status for workflow completion
# once the workflow is complete (see the expected output below for completion), move on to the next step
wid=$(cat /vagrant/compose/manifests/workflow/workflow_id.txt); docker exec -it vagrant_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
wid=$(cat /vagrant/compose/manifests/workflow/workflow_id.txt); docker exec -it compose_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
```
<details>

View File

@ -219,7 +219,7 @@ This option will also show you how to create a machine to provision.
vagrant ssh provisioner
# watch the workflow events and status for workflow completion
# once the workflow is complete (see the expected output below for completion), move on to the next step
wid=$(cat /vagrant/compose/manifests/workflow/workflow_id.txt); docker exec -it vagrant_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
wid=$(cat /vagrant/compose/manifests/workflow/workflow_id.txt); docker exec -it compose_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
```
<details>