diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54a4cb4..8fa7bb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,19 +2,14 @@ # gitLab ci stages stages: - - # deployment - "gitleaks" - "linting" - - "deployment" - # include jobs include: - # deployment + # code plumber - local: ".gitlab/gitleaks.yaml" - - local: ".gitlab/deployment.yaml" # linting - component: "$CI_SERVER_FQDN/components/ansible/linting@v3.0.3" diff --git a/.gitlab/deployment.yaml b/.gitlab/deployment.yaml deleted file mode 100644 index 869badc..0000000 --- a/.gitlab/deployment.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# deploy ansible/roles/common code -deployment: - stage: "deployment" - image: - name: "registry.gitlab.simoncor.net/oci/ssh-client:v25.06.03" - entrypoint: ["/bin/sh", "-c"] - rules: - - # run only on push to default branch - - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - - when: "never" - - # prepare ssh - before_script: - - # prepare ssh - - | - # prepare ssh - mkdir -p ~/.ssh - chmod 700 ~/.ssh - echo "$SSH_CONFIG" > ~/.ssh/config - echo "$SSH_DEPLOYMENT_KEY" > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - - # deployment commands - script: - - - | - # install ansible roles dependancies - ssh $SSH_DEPLOYMENT_USER@$ANSIBLE_SERVER \ - "sudo /usr/local/bin/ansible-galaxy install -r /etc/ansible/roles/requirements.yaml --force" diff --git a/meta/main.yaml b/meta/main.yaml index 17e4c82..3b5cab9 100644 --- a/meta/main.yaml +++ b/meta/main.yaml @@ -5,4 +5,5 @@ galaxy_info: description: "install and configure a Zabbix Proxy" license: "MIT" role_name: "zabbix_proxy" -dependencies: [] +dependencies: + - "zabbix_prereq" diff --git a/playbook.yaml b/playbook.yaml index b4534ef..077f9f2 100644 --- a/playbook.yaml +++ b/playbook.yaml @@ -15,6 +15,7 @@ changed_when: false failed_when: false - roles: - - role: "zabbix_prereq" - - role: "zabbix_proxy" + # execute the role + - name: "execute role: zabbix_proxy" + ansible.builtin.include_role: + name: "zabbix_proxy" diff --git a/README.md b/readme.md similarity index 100% rename from README.md rename to readme.md