diff --git a/environments/manager/requirements.yml b/environments/manager/requirements.yml deleted file mode 100644 index 153306a..0000000 --- a/environments/manager/requirements.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN - -collections: - - name: https://github.com/osism/ansible-collection-commons.git - type: git - version: main - - - name: https://github.com/osism/ansible-collection-services.git - type: git - version: main - - - name: https://github.com/osism/ansible-playbooks-manager.git - type: git - version: main diff --git a/environments/manager/run.sh b/environments/manager/run.sh index 72f6548..d0c3de4 100755 --- a/environments/manager/run.sh +++ b/environments/manager/run.sh @@ -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} @@ -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 diff --git a/releasenotes/notes/remove-ansible-requirements-6c6eba43f616bc6b.yaml b/releasenotes/notes/remove-ansible-requirements-6c6eba43f616bc6b.yaml new file mode 100644 index 0000000..e0b9bf4 --- /dev/null +++ b/releasenotes/notes/remove-ansible-requirements-6c6eba43f616bc6b.yaml @@ -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.