Skip to content

Commit

Permalink
manager: remove ansible requirements.yml file (#362)
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Berendt <[email protected]>
  • Loading branch information
berendt authored Sep 22, 2023
1 parent 69e73a8 commit e2f04a9
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 18 deletions.
15 changes: 0 additions & 15 deletions environments/manager/requirements.yml

This file was deleted.

8 changes: 5 additions & 3 deletions environments/manager/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN

ANSIBLE_COLLECTION_SERVICES_VERSION=${ANSIBLE_COLLECTION_SERVICES_VERSION:-main}
ANSIBLE_PLAYBOOKS_MANAGER_VERSION=${ANSIBLE_PLAYBOOKS_MANAGER_VERSION:-main}

INSTALL_ANSIBLE=${INSTALL_ANSIBLE:-true}
INSTALL_ANSIBLE_ROLES=${INSTALL_ANSIBLE_ROLES:-true}
VENV_PATH=${VENV_PATH:-.venv}
Expand Down Expand Up @@ -40,9 +43,8 @@ ANSIBLE_USER=${ANSIBLE_USER:-dragon}
CLEANUP=${CLEANUP:-false}

if [[ $INSTALL_ANSIBLE_ROLES == "true" ]]; then

ansible-galaxy install -f -r requirements.yml

ansible-galaxy collection install -f "git+https://github.com/osism/ansible-collection-services,${ANSIBLE_COLLECTION_SERVICES_VERSION}"
ansible-galaxy collection install -f "git+https://github.com/osism/ansible-playbooks-manager,${ANSIBLE_PLAYBOOKS_MANAGER_VERSION}"
fi

if [[ ! -e id_rsa.operator ]]; then
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
features:
- |
The `requirements.yml` has been removed. The version will be set in the `run.sh`
script for the seed process in the future exactly as later in the update process
via the parameters `ANSIBLE_COLLECTION_SERVICES_VERSION` and
`ANSIBLE_PLAYBOOKS_MANAGER_VERSION`.
upgrade:
- |
In existing configuration repositories, the `environments/manager/requirements.yml`
file can be removed after the generics have been synced.

0 comments on commit e2f04a9

Please sign in to comment.