Commit 1832027f authored by Simon Cornet's avatar Simon Cornet
Browse files

feat: implement new role layout

parent 149467da

.gitlab-ci.yml

+1 −6
Original line number Diff line number Diff line
@@ -2,19 +2,14 @@ 


# gitLab ci stages

stages:



  # deployment

  - "gitleaks"

  - "linting"

  - "deployment"





# include jobs

include:



  # deployment

  # code plumbing

  - local: ".gitlab/gitleaks.yaml"

  - local: ".gitlab/deployment.yaml"



  # linting

  - component: "$CI_SERVER_FQDN/components/ansible/linting@v3.0.3"

playbook.yaml

+5 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
- name: "install Grafana and Prometheus"

  hosts: "all"

  become: true

  pre_tasks:

  tasks:



    # due to semaphore bug we need to do this ourselves

    - name: "force-update requirements"
@@ -15,7 +15,7 @@ 
      changed_when: false

      failed_when: false



  roles:

    - role: "docker"

    - role: "grafana"

    - role: "traefik"
 
    # execute the role

    - name: "execute role: grafana"

      ansible.builtin.include_role:

        name: "grafana"

roles/requirements.yml

+0 −6
Original line number Diff line number Diff line 
---



roles:

  - name: "docker"

    src: "https://gitlab.simoncor.net/ansible/ans-docker.git"

    scm: "git"

  - name: "grafana"

    src: "https://gitlab.simoncor.net/ansible/ans-grafana.git"

    scm: "git"
 
  - name: "traefik"

    src: "https://gitlab.simoncor.net/ansible/ans-traefik.git"

    scm: "git"