diff --git a/start-server/.travis.yml b/db/.travis.yml similarity index 100% rename from start-server/.travis.yml rename to db/.travis.yml diff --git a/start-server/README.md b/db/README.md similarity index 100% rename from start-server/README.md rename to db/README.md diff --git a/start-server/defaults/main.yml b/db/defaults/main.yml similarity index 100% rename from start-server/defaults/main.yml rename to db/defaults/main.yml diff --git a/start-server/files/docker-compose-server.yml b/db/files/docker-compose-server.yml similarity index 100% rename from start-server/files/docker-compose-server.yml rename to db/files/docker-compose-server.yml diff --git a/start-server/handlers/main.yml b/db/handlers/main.yml similarity index 100% rename from start-server/handlers/main.yml rename to db/handlers/main.yml diff --git a/start-server/meta/main.yml b/db/meta/main.yml similarity index 100% rename from start-server/meta/main.yml rename to db/meta/main.yml diff --git a/db/tasks/deploy-db.yml b/db/tasks/deploy-db.yml new file mode 100644 index 0000000..51f9290 --- /dev/null +++ b/db/tasks/deploy-db.yml @@ -0,0 +1,34 @@ +# deploy db postgresql, liquibase and redis + +- name: git archive local + local_action: + module: git + repo: "https://{{ git_username | urlencode }}:{{ git_password | urlencode }}@git.valczeryba.ovh/v4l3n71n/covas-liquibase.git" + dest: "/home/valentin/src/" + archive: "/tmp/covas-liquibase.tar.gz" + force: yes + update: yes + run_once: True + +- name: Create directory + file: + path: "/home/valentin/{{ item }}" + state: directory + with_items: + - db + - db/covas-liquibase + +- name: Extract covas liquibase + unarchive: + src: "/tmp/covas-liquibase.tar.gz" + dest: "/home/valentin/db/covas-liquibase" + +- name: Template env file + template: + src: env.j2 + dest: /home/valentin/db/.env + +- name: Copy docker compose server file + copy: + src: docker-compose-server.yml + dest: /home/valentin/db/docker-compose.yml \ No newline at end of file diff --git a/db/tasks/main.yml b/db/tasks/main.yml new file mode 100644 index 0000000..a3a64be --- /dev/null +++ b/db/tasks/main.yml @@ -0,0 +1,23 @@ +--- +# tasks file for server + + + +# include task db + +- name: Deploy database postgresql and redis + ansible.builtin.import_tasks: deploy-db.yml + tags: ["start-with-deploy", "deploy"] + +- name: Start db postgresql and redis + ansible.builtin.import_tasks: start-db.yml + tags: ["start-with-deploy", "start"] + + +- name: stop db postgresql and redis + ansible.builtin.import_tasks: stop-db.yml + tags: ["destroy", "stop"] + +- name: Remove db + ansible.builtin.import_tasks: remove-db.yml + tags: ["destroy"] \ No newline at end of file diff --git a/db/tasks/remove-db.yml b/db/tasks/remove-db.yml new file mode 100644 index 0000000..050d293 --- /dev/null +++ b/db/tasks/remove-db.yml @@ -0,0 +1,18 @@ +# remove db + +- name: Stopping existing service + community.docker.docker_compose: + project_src: /home/valentin/db + state: absent + remove_volumes: yes + remove_images: local + register: output + +- name: Debug output + debug: + var: output + +- name: Remove project covas db + file: + path: /home/valentin/db + state: absent \ No newline at end of file diff --git a/db/tasks/start-db.yml b/db/tasks/start-db.yml new file mode 100644 index 0000000..d7b6a07 --- /dev/null +++ b/db/tasks/start-db.yml @@ -0,0 +1,34 @@ +# start services db + +- name: Stopping existing service + community.docker.docker_compose: + project_src: /home/valentin/db + +- name: Starting service + community.docker.docker_compose: + project_src: /home/valentin/db + register: output + +- name: debug output + debug: + var: output + +- name: Allow port postgresql + ansible.builtin.iptables: + chain: INPUT + protocol: tcp + destination_port: 54321 + jump: ACCEPT + state: present + become: yes + become_method: sudo + +- name: Allow port redis + ansible.builtin.iptables: + chain: INPUT + protocol: tcp + destination_port: 63791 + jump: ACCEPT + state: present + become: yes + become_method: sudo \ No newline at end of file diff --git a/stop-server/tasks/main.yml b/db/tasks/stop-db.yml similarity index 89% rename from stop-server/tasks/main.yml rename to db/tasks/stop-db.yml index 333f934..c78bd95 100644 --- a/stop-server/tasks/main.yml +++ b/db/tasks/stop-db.yml @@ -1,5 +1,4 @@ ---- -# tasks file for server +# stop services db and redis - name: Disallow port postgresql ansible.builtin.iptables: @@ -25,11 +24,11 @@ - name: Stopping existing service community.docker.docker_compose: project_src: /home/valentin/db - state: absent + state: present + stopped: yes register: output - name: Debug output debug: var: output - diff --git a/start-server/templates/env.j2 b/db/templates/env.j2 similarity index 100% rename from start-server/templates/env.j2 rename to db/templates/env.j2 diff --git a/start-server/vars/main.yml b/db/vars/main.yml similarity index 100% rename from start-server/vars/main.yml rename to db/vars/main.yml diff --git a/main.tf b/main.tf index c21992b..2aa7a66 100644 --- a/main.tf +++ b/main.tf @@ -7,19 +7,13 @@ terraform { required_version = ">= 0.13" } -provider "scaleway" { - access_key = "SCWH4K0JHQNCMYMAAZE3" - secret_key = "23d5fbf2-c4c6-4139-a341-83ee6ca9e46d" - -} - resource "scaleway_k8s_cluster" "terraform-test" { +resource "scaleway_k8s_cluster" "terraform-test" { name = "terraform-test" - version = "1.19.4" + version = "1.24.3" cni = "cilium" project_id = "81af2696-6120-4f45-baf3-d17fb0525824" region = "fr-par" - - } +} resource "scaleway_k8s_pool" "john" { cluster_id = scaleway_k8s_cluster.terraform-test.id diff --git a/playbook.yml b/playbook.yml index d274665..9d6f5cb 100644 --- a/playbook.yml +++ b/playbook.yml @@ -2,11 +2,4 @@ - hosts: db remote_user: valentin roles: - - start-server - tags: [ "start" ] - -- hosts: db - remote_user: valentin - roles: - - stop-server - tags: [ "stop" ] + - db \ No newline at end of file diff --git a/start-server/tasks/main.yml b/start-server/tasks/main.yml deleted file mode 100644 index 691e263..0000000 --- a/start-server/tasks/main.yml +++ /dev/null @@ -1,69 +0,0 @@ ---- -# tasks file for server - -- name: git archive local - local_action: - module: git - repo: "https://{{ git_username | urlencode }}:{{ git_password | urlencode }}@git.valczeryba.ovh/v4l3n71n/covas-liquibase.git" - dest: "/home/valentin/src/" - archive: "/tmp/covas-liquibase.tar.gz" - force: yes - update: yes - run_once: True - -- name: Create directory - file: - path: "/home/valentin/{{ item }}" - state: directory - with_items: - - db - - db/covas-liquibase - -- name: Extract repo isr - unarchive: - src: "/tmp/covas-liquibase.tar.gz" - dest: "/home/valentin/db/covas-liquibase" - -- name: Template env file - template: - src: env.j2 - dest: /home/valentin/db/.env - -- name: Copy docker compose server file - copy: - src: docker-compose-server.yml - dest: /home/valentin/db/docker-compose.yml - - -- name: Stopping existing service - community.docker.docker_compose: - project_src: /home/valentin/db - -- name: Starting service - community.docker.docker_compose: - project_src: /home/valentin/db - register: output - -- name: debug output - debug: - var: output - -- name: Allow port postgresql - ansible.builtin.iptables: - chain: INPUT - protocol: tcp - destination_port: 54321 - jump: ACCEPT - state: present - become: yes - become_method: sudo - -- name: Allow port redis - ansible.builtin.iptables: - chain: INPUT - protocol: tcp - destination_port: 63791 - jump: ACCEPT - state: present - become: yes - become_method: sudo \ No newline at end of file diff --git a/stop-server/.travis.yml b/stop-server/.travis.yml deleted file mode 100644 index 36bbf62..0000000 --- a/stop-server/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -language: python -python: "2.7" - -# Use the new container infrastructure -sudo: false - -# Install ansible -addons: - apt: - packages: - - python-pip - -install: - # Install ansible - - pip install ansible - - # Check ansible version - - ansible --version - - # Create ansible.cfg with correct roles_path - - printf '[defaults]\nroles_path=../' >ansible.cfg - -script: - # Basic role syntax check - - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - -notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/stop-server/README.md b/stop-server/README.md deleted file mode 100644 index 225dd44..0000000 --- a/stop-server/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. - -Role Variables --------------- - -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. - -Dependencies ------------- - -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } - -License -------- - -BSD - -Author Information ------------------- - -An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/stop-server/defaults/main.yml b/stop-server/defaults/main.yml deleted file mode 100644 index 492c903..0000000 --- a/stop-server/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for server diff --git a/stop-server/handlers/main.yml b/stop-server/handlers/main.yml deleted file mode 100644 index e7b1089..0000000 --- a/stop-server/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for server diff --git a/stop-server/meta/main.yml b/stop-server/meta/main.yml deleted file mode 100644 index c572acc..0000000 --- a/stop-server/meta/main.yml +++ /dev/null @@ -1,52 +0,0 @@ -galaxy_info: - author: your name - description: your role description - company: your company (optional) - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) - - min_ansible_version: 2.1 - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/stop-server/vars/main.yml b/stop-server/vars/main.yml deleted file mode 100644 index ea07ae9..0000000 --- a/stop-server/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for server