🔥(terraform) remove legacy terraform and OpenStack references
Some outdated references to Terraform and OpenStack were missed during the project quickstart. These are legacy elements inherited from OpenFun. This commit cleans up the codebase.
This commit is contained in:
committed by
Laurent Bossavit
parent
2f7449f727
commit
1e025f034f
6
.gitignore
vendored
6
.gitignore
vendored
@@ -42,7 +42,6 @@ env.bak/
|
|||||||
venv.bak/
|
venv.bak/
|
||||||
env.d/development/*
|
env.d/development/*
|
||||||
!env.d/development/*.dist
|
!env.d/development/*.dist
|
||||||
env.d/terraform
|
|
||||||
|
|
||||||
# npm
|
# npm
|
||||||
node_modules
|
node_modules
|
||||||
@@ -59,11 +58,6 @@ src/frontend/tsclient
|
|||||||
# Logs
|
# Logs
|
||||||
*.log
|
*.log
|
||||||
|
|
||||||
# Terraform
|
|
||||||
.terraform
|
|
||||||
*.tfstate
|
|
||||||
*.tfstate.backup
|
|
||||||
|
|
||||||
# Test & lint
|
# Test & lint
|
||||||
.coverage
|
.coverage
|
||||||
coverage.json
|
coverage.json
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ set -eo pipefail
|
|||||||
REPO_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd)"
|
REPO_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd)"
|
||||||
UNSET_USER=0
|
UNSET_USER=0
|
||||||
|
|
||||||
TERRAFORM_DIRECTORY="./env.d/terraform"
|
|
||||||
COMPOSE_FILE="${REPO_DIR}/docker-compose.yml"
|
COMPOSE_FILE="${REPO_DIR}/docker-compose.yml"
|
||||||
COMPOSE_PROJECT="people"
|
COMPOSE_PROJECT="people"
|
||||||
|
|
||||||
@@ -92,66 +91,3 @@ function _dc_exec() {
|
|||||||
function _django_manage() {
|
function _django_manage() {
|
||||||
_dc_run "app-dev" python manage.py "$@"
|
_dc_run "app-dev" python manage.py "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
# _set_openstack_project: select an OpenStack project from the openrc files defined in the
|
|
||||||
# terraform directory.
|
|
||||||
#
|
|
||||||
# usage: _set_openstack_project
|
|
||||||
#
|
|
||||||
# If necessary the script will prompt the user to choose a project from those available
|
|
||||||
function _set_openstack_project() {
|
|
||||||
|
|
||||||
declare prompt
|
|
||||||
declare -a projects
|
|
||||||
declare -i default=1
|
|
||||||
declare -i choice=0
|
|
||||||
declare -i n_projects
|
|
||||||
|
|
||||||
# List projects by looking in the "./env.d/terraform" directory
|
|
||||||
# and store them in an array
|
|
||||||
read -r -a projects <<< "$(
|
|
||||||
find "${TERRAFORM_DIRECTORY}" -maxdepth 1 -mindepth 1 -type d |
|
|
||||||
sed 's|'"${TERRAFORM_DIRECTORY}\/"'||' |
|
|
||||||
xargs
|
|
||||||
)"
|
|
||||||
nb_projects=${#projects[@]}
|
|
||||||
|
|
||||||
if [[ ${nb_projects} -le 0 ]]; then
|
|
||||||
echo "There are no OpenStack projects defined..." >&2
|
|
||||||
echo "To add one, create a subdirectory in \"${TERRAFORM_DIRECTORY}\" with the name" \
|
|
||||||
"of your project and copy your \"openrc.sh\" file into it." >&2
|
|
||||||
exit 10
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${nb_projects} -gt 1 ]]; then
|
|
||||||
prompt="Select an OpenStack project to target:\\n"
|
|
||||||
for (( i=0; i<nb_projects; i++ )); do
|
|
||||||
prompt+="[$((i+1))] ${projects[$i]}"
|
|
||||||
if [[ $((i+1)) -eq ${default} ]]; then
|
|
||||||
prompt+=" (default)"
|
|
||||||
fi
|
|
||||||
prompt+="\\n"
|
|
||||||
done
|
|
||||||
prompt+="If your OpenStack project is not listed, add it to the \"env.d/terraform\" directory.\\n"
|
|
||||||
prompt+="Your choice: "
|
|
||||||
read -r -p "$(echo -e "${prompt}")" choice
|
|
||||||
|
|
||||||
if [[ ${choice} -gt nb_projects ]]; then
|
|
||||||
(>&2 echo "Invalid choice ${choice} (should be <= ${nb_projects})")
|
|
||||||
exit 11
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${choice} -le 0 ]]; then
|
|
||||||
choice=${default}
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
project=${projects[$((choice-1))]}
|
|
||||||
# Check that the openrc.sh file exists for this project
|
|
||||||
if [ ! -f "${TERRAFORM_DIRECTORY}/${project}/openrc.sh" ]; then
|
|
||||||
(>&2 echo "Missing \"openrc.sh\" file in \"${TERRAFORM_DIRECTORY}/${project}\". Check documentation.")
|
|
||||||
exit 12
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "${project}"
|
|
||||||
}
|
|
||||||
|
|||||||
25
bin/state
25
bin/state
@@ -1,25 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -eo pipefail
|
|
||||||
|
|
||||||
source "$(dirname "${BASH_SOURCE[0]}")/_config.sh"
|
|
||||||
|
|
||||||
project=$(_set_openstack_project)
|
|
||||||
echo "Using \"${project}\" project..."
|
|
||||||
|
|
||||||
source "${TERRAFORM_DIRECTORY}/${project}/openrc.sh"
|
|
||||||
|
|
||||||
# Run Terraform commands in the Hashicorp docker container via docker compose
|
|
||||||
# shellcheck disable=SC2068
|
|
||||||
DOCKER_USER="$(id -u):$(id -g)" \
|
|
||||||
PROJECT="${project}" \
|
|
||||||
docker compose run --rm \
|
|
||||||
-e OS_AUTH_URL \
|
|
||||||
-e OS_IDENTITY_API_VERSION \
|
|
||||||
-e OS_USER_DOMAIN_NAME \
|
|
||||||
-e OS_PROJECT_DOMAIN_NAME \
|
|
||||||
-e OS_TENANT_ID \
|
|
||||||
-e OS_TENANT_NAME \
|
|
||||||
-e OS_USERNAME \
|
|
||||||
-e OS_PASSWORD \
|
|
||||||
-e OS_REGION_NAME \
|
|
||||||
terraform-state "$@"
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -eo pipefail
|
|
||||||
|
|
||||||
source "$(dirname "${BASH_SOURCE[0]}")/_config.sh"
|
|
||||||
|
|
||||||
project=$(_set_openstack_project)
|
|
||||||
echo "Using \"${project}\" project..."
|
|
||||||
|
|
||||||
source "${TERRAFORM_DIRECTORY}/${project}/openrc.sh"
|
|
||||||
|
|
||||||
# Run Terraform commands in the Hashicorp docker container via docker compose
|
|
||||||
# shellcheck disable=SC2068
|
|
||||||
DOCKER_USER="$(id -u):$(id -g)" \
|
|
||||||
PROJECT="${project}" \
|
|
||||||
docker compose run --rm \
|
|
||||||
-e OS_AUTH_URL \
|
|
||||||
-e OS_IDENTITY_API_VERSION \
|
|
||||||
-e OS_USER_DOMAIN_NAME \
|
|
||||||
-e OS_PROJECT_DOMAIN_NAME \
|
|
||||||
-e OS_TENANT_ID \
|
|
||||||
-e OS_TENANT_NAME \
|
|
||||||
-e OS_USERNAME \
|
|
||||||
-e OS_PASSWORD \
|
|
||||||
-e OS_REGION_NAME \
|
|
||||||
-e TF_VAR_user_name \
|
|
||||||
terraform "$@"
|
|
||||||
@@ -117,22 +117,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ".:/app"
|
- ".:/app"
|
||||||
|
|
||||||
terraform-state:
|
|
||||||
image: hashicorp/terraform:1.6
|
|
||||||
environment:
|
|
||||||
- TF_WORKSPACE=${PROJECT:-} # avoid env conflict in local state
|
|
||||||
user: ${DOCKER_USER:-1000}
|
|
||||||
working_dir: /app
|
|
||||||
volumes:
|
|
||||||
- ./src/terraform/create_state_bucket:/app
|
|
||||||
|
|
||||||
terraform:
|
|
||||||
image: hashicorp/terraform:1.6
|
|
||||||
user: ${DOCKER_USER:-1000}
|
|
||||||
working_dir: /app
|
|
||||||
volumes:
|
|
||||||
- ./src/terraform:/app
|
|
||||||
|
|
||||||
kc_postgresql:
|
kc_postgresql:
|
||||||
image: postgres:14.3
|
image: postgres:14.3
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
Reference in New Issue
Block a user