From 3e06e263ae72da431614d9ed10aeab4983c967c4 Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Mon, 10 Jul 2023 11:43:36 -0400 Subject: [PATCH] Update kafka download link and bump version --- data/ansible/integration_tests/main.yaml | 56 +++++++++---------- .../roles/install_cgrates/tasks/main.yaml | 20 +++---- .../defaults/main.yaml | 2 +- .../{install_kafka => kafka}/tasks/main.yaml | 2 +- .../templates/kafka.service.j2 | 0 .../templates/zookeeper.service.j2 | 0 6 files changed, 39 insertions(+), 41 deletions(-) rename data/ansible/roles/{install_kafka => kafka}/defaults/main.yaml (79%) rename data/ansible/roles/{install_kafka => kafka}/tasks/main.yaml (90%) rename data/ansible/roles/{install_kafka => kafka}/templates/kafka.service.j2 (100%) rename data/ansible/roles/{install_kafka => kafka}/templates/zookeeper.service.j2 (100%) diff --git a/data/ansible/integration_tests/main.yaml b/data/ansible/integration_tests/main.yaml index 49b7e9783..ca38311a5 100644 --- a/data/ansible/integration_tests/main.yaml +++ b/data/ansible/integration_tests/main.yaml @@ -1,38 +1,38 @@ --- - hosts: local tasks: - - name: Install RabbitMQ - import_role: - name: ../roles/install_rabbitmq + - name: Install RabbitMQ + import_role: + name: ../roles/install_rabbitmq - - name: Install NATS - import_role: - name: ../roles/nats + - name: Install NATS + import_role: + name: ../roles/nats - - name: Install ElasticSearch - import_role: - name: ../roles/elasticsearch - vars: - auto_create_index: ".monitoring*,.watches,.triggered_watches,.watcher-history*,.ml*,cdrs" + - name: Install ElasticSearch + import_role: + name: ../roles/elasticsearch + vars: + auto_create_index: ".monitoring*,.watches,.triggered_watches,.watcher-history*,.ml*,cdrs" - # # Trying for now to overwrite the auto_create_index defaults. - # # In case of failure, we will be using the commented task below: - # - name: Create 'cdrs' index in Elasticsearch for CGRateS integration tests - # command: 'curl -X PUT "localhost:9200/cdrs?pretty"' - # ignore_errors: yes + # # Trying for now to overwrite the auto_create_index defaults. + # # In case of failure, we will be using the commented task below: + # - name: Create 'cdrs' index in Elasticsearch for CGRateS integration tests + # command: 'curl -X PUT "localhost:9200/cdrs?pretty"' + # ignore_errors: yes - - name: Install Kafka - import_role: - name: ../roles/install_kafka + - name: Install Kafka + import_role: + name: ../roles/kafka - - name: Install MongoDB - import_role: - name: ../roles/install_mongodb + - name: Install MongoDB + import_role: + name: ../roles/install_mongodb - - name: Install Go - import_role: - name: ../roles/go + - name: Install Go + import_role: + name: ../roles/go - - name: Install and configure CGRateS - import_role: - name: ../roles/install_cgrates \ No newline at end of file + - name: Install and configure CGRateS + import_role: + name: ../roles/install_cgrates diff --git a/data/ansible/roles/install_cgrates/tasks/main.yaml b/data/ansible/roles/install_cgrates/tasks/main.yaml index d78a353c2..139a15345 100644 --- a/data/ansible/roles/install_cgrates/tasks/main.yaml +++ b/data/ansible/roles/install_cgrates/tasks/main.yaml @@ -2,7 +2,7 @@ - name: Install CGRateS dependencies become: yes ansible.builtin.package: - name: '{{ cgrates_dependencies }}' + name: "{{ cgrates_dependencies }}" state: present update_cache: yes cache_valid_time: 86400 @@ -10,25 +10,24 @@ - name: Create cgrates directory ansible.builtin.file: state: directory - mode: 'u=rwx,go=rx' + mode: "u=rwx,go=rx" owner: "{{ ansible_user }}" - group: "{{ ansible_user }}" - dest: '{{ cgrates_dir }}' + dest: "{{ cgrates_dir }}" - name: Git clone cgrates ansible.builtin.git: repo: https://github.com/cgrates/cgrates.git - dest: '{{ cgrates_dir }}' + dest: "{{ cgrates_dir }}" update: yes force: yes - version: '{{ git_version }}' + version: "{{ git_version }}" - name: Build cgrates ansible.builtin.command: cmd: bash -lc "source /etc/profile.d/golang.sh && sh {{ cgrates_dir }}/build.sh" args: - chdir: '{{ cgrates_dir }}' - become_user: '{{ ansible_user }}' + chdir: "{{ cgrates_dir }}" + become_user: "{{ ansible_user }}" - name: Create symbolic links ansible.builtin.file: @@ -43,7 +42,7 @@ - name: Run post install scripts ansible.builtin.shell: cmd: "{{ item.cmd }}" - chdir: '{{ cgrates_dir }}/data/storage/{{ item.db }}' + chdir: "{{ cgrates_dir }}/data/storage/{{ item.db }}" become: yes loop: - { db: "mysql", cmd: "sh setup_ers_db.sh root CGRateS.org localhost" } @@ -54,7 +53,6 @@ - name: Set versions ansible.builtin.shell: - cmd: 'cgr-migrator -exec=*set_versions -config_path=/usr/share/cgrates/conf/samples/tutmysql' + cmd: "cgr-migrator -exec=*set_versions -config_path=/usr/share/cgrates/conf/samples/tutmysql" environment: PATH: "{{ lookup('env','PATH') }}:{{ golang_gopath }}/bin:/usr/local/go/bin:{{ ansible_env.PATH }}" - diff --git a/data/ansible/roles/install_kafka/defaults/main.yaml b/data/ansible/roles/kafka/defaults/main.yaml similarity index 79% rename from data/ansible/roles/install_kafka/defaults/main.yaml rename to data/ansible/roles/kafka/defaults/main.yaml index 76b4d24fb..98539662a 100644 --- a/data/ansible/roles/install_kafka/defaults/main.yaml +++ b/data/ansible/roles/kafka/defaults/main.yaml @@ -1,5 +1,5 @@ --- -kafka_version: 3.4.0 +kafka_version: 3.5.0 scala_version: 2.13 kafka_service_state: started kafka_service_enabled: true \ No newline at end of file diff --git a/data/ansible/roles/install_kafka/tasks/main.yaml b/data/ansible/roles/kafka/tasks/main.yaml similarity index 90% rename from data/ansible/roles/install_kafka/tasks/main.yaml rename to data/ansible/roles/kafka/tasks/main.yaml index da1af525c..46cc8e381 100644 --- a/data/ansible/roles/install_kafka/tasks/main.yaml +++ b/data/ansible/roles/kafka/tasks/main.yaml @@ -8,7 +8,7 @@ - name: Download Apache Kafka get_url: - url: "https://dlcdn.apache.org/kafka/{{ kafka_version }}/kafka_{{ scala_version }}-{{ kafka_version }}.tgz" + url: "https://downloads.apache.org/kafka/{{ kafka_version }}/kafka_{{ scala_version }}-{{ kafka_version }}.tgz" dest: "/tmp/kafka_{{ scala_version }}-{{ kafka_version }}.tgz" mode: '0755' diff --git a/data/ansible/roles/install_kafka/templates/kafka.service.j2 b/data/ansible/roles/kafka/templates/kafka.service.j2 similarity index 100% rename from data/ansible/roles/install_kafka/templates/kafka.service.j2 rename to data/ansible/roles/kafka/templates/kafka.service.j2 diff --git a/data/ansible/roles/install_kafka/templates/zookeeper.service.j2 b/data/ansible/roles/kafka/templates/zookeeper.service.j2 similarity index 100% rename from data/ansible/roles/install_kafka/templates/zookeeper.service.j2 rename to data/ansible/roles/kafka/templates/zookeeper.service.j2