From 7f64795e166001329863897d7b9aebb9afb099c8 Mon Sep 17 00:00:00 2001 From: Vijay N Date: Tue, 16 Jun 2026 16:49:17 +0530 Subject: [PATCH 1/9] Updated aviate.yml, removed Cloudsmith URL dependency. --- .../roles/killbill/tasks/plugins/aviate.yml | 27 +------------------ docker/templates/base/latest/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/ansible/roles/killbill/tasks/plugins/aviate.yml b/ansible/roles/killbill/tasks/plugins/aviate.yml index 9ab53f7d..03fac9b5 100644 --- a/ansible/roles/killbill/tasks/plugins/aviate.yml +++ b/ansible/roles/killbill/tasks/plugins/aviate.yml @@ -1,33 +1,8 @@ --- -- name: Get latest Aviate plugin version - ansible.builtin.uri: - url: "{{ cloudsmith_url_aviate }}/killbill/aviate/maven/com/kill-bill/billing/plugin/java/aviate-plugin-prod/maven-metadata.xml" - return_content: true - register: killbill_aviate_metadata - tags: - - aviate - - plugins - -- name: Set aviate version - ansible.builtin.set_fact: - killbill_aviate_version: "{{ killbill_aviate_metadata.content | regex_search('(.*)', '\\1') | first }}" - tags: - - aviate - - plugins - -- name: Download Aviate plugin jar - ansible.builtin.get_url: - url: "{{ cloudsmith_url_aviate }}/killbill/aviate/maven/com/kill-bill/billing/plugin/java/aviate-plugin-prod/{{ killbill_aviate_version }}/aviate-plugin-prod-{{ killbill_aviate_version }}.jar" - dest: "{{ kb_plugins_dir }}/aviate-plugin-{{ killbill_aviate_version }}.jar" - mode: "0644" - tags: - - aviate - - plugins - - name: Install Aviate plugin become: true ansible.builtin.command: | - "{{ kpm_path }}/kpm" install_java_plugin aviate --from-source-file={{ kb_plugins_dir }}/aviate-plugin-{{ killbill_aviate_version }}.jar --destination={{ kb_plugins_dir }} + "{{ kpm_path }}/kpm" install_java_plugin aviate --from-source-file={{ kb_plugins_dir }}/aviate-plugin.jar --destination={{ kb_plugins_dir }} args: creates: "{{ kb_plugins_dir }}/plugins/java/aviate-plugin" tags: diff --git a/docker/templates/base/latest/Dockerfile b/docker/templates/base/latest/Dockerfile index cd174252..f8bd7691 100644 --- a/docker/templates/base/latest/Dockerfile +++ b/docker/templates/base/latest/Dockerfile @@ -57,7 +57,7 @@ WORKDIR $TOMCAT_HOME # Install ansible roles dependencies ARG KILLBILL_CLOUD_VERSION RUN ansible-galaxy collection install community.general && \ - ansible-galaxy install git+https://git@github.com/killbill/killbill-cloud.git,$KILLBILL_CLOUD_VERSION + ansible-galaxy install git+https://git@github.com/vnandwana/killbill-cloud.git,$KILLBILL_CLOUD_VERSION ENV KILLBILL_CLOUD_ANSIBLE_ROLES=$TOMCAT_HOME/.ansible/roles/killbill-cloud/ansible ENV ENV_HOST_IP=localhost ENV ANSIBLE_OPTS="-i localhost, \ From 26f626df23dc18076ad2c9dc42244a9873eb49d3 Mon Sep 17 00:00:00 2001 From: Vijay N Date: Tue, 16 Jun 2026 17:23:34 +0530 Subject: [PATCH 2/9] Copied install_plugins.yml to Docker image. --- docker/templates/killbill/latest/Dockerfile.template | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/templates/killbill/latest/Dockerfile.template b/docker/templates/killbill/latest/Dockerfile.template index 28704920..aa919b9d 100644 --- a/docker/templates/killbill/latest/Dockerfile.template +++ b/docker/templates/killbill/latest/Dockerfile.template @@ -23,6 +23,7 @@ COPY ./kpm.yml $KILLBILL_INSTALL_DIR COPY ./setenv2.sh $CATALINA_BASE/bin COPY ./killbill.sh $KILLBILL_INSTALL_DIR COPY ./shiro.ini.template $KILLBILL_INSTALL_DIR/config +COPY ./install_plugins.yml $KILLBILL_CLOUD_ANSIBLE_ROLES ENV KPM_INSTALL_CMD="ansible-playbook $ANSIBLE_OPTS \ -e kpm_install_dir=$KPM_INSTALL_DIR \ From 4038dbc1d1b2e31e34f0867d2598f043496c2e85 Mon Sep 17 00:00:00 2001 From: Vijay N Date: Tue, 16 Jun 2026 20:18:43 +0530 Subject: [PATCH 3/9] Removed copy install_plugins.yml command from Dockerfile --- docker/templates/killbill/latest/Dockerfile.template | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/templates/killbill/latest/Dockerfile.template b/docker/templates/killbill/latest/Dockerfile.template index aa919b9d..28704920 100644 --- a/docker/templates/killbill/latest/Dockerfile.template +++ b/docker/templates/killbill/latest/Dockerfile.template @@ -23,7 +23,6 @@ COPY ./kpm.yml $KILLBILL_INSTALL_DIR COPY ./setenv2.sh $CATALINA_BASE/bin COPY ./killbill.sh $KILLBILL_INSTALL_DIR COPY ./shiro.ini.template $KILLBILL_INSTALL_DIR/config -COPY ./install_plugins.yml $KILLBILL_CLOUD_ANSIBLE_ROLES ENV KPM_INSTALL_CMD="ansible-playbook $ANSIBLE_OPTS \ -e kpm_install_dir=$KPM_INSTALL_DIR \ From c350273cd812f66e1b3a90dd12160f71d48568c8 Mon Sep 17 00:00:00 2001 From: Vijay N Date: Wed, 17 Jun 2026 00:39:07 +0530 Subject: [PATCH 4/9] Fixed the uninitialized constant for CGI bug -- in Ruby 3.x, CGI is no longer automatically loaded. --- kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb b/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb index 5ba45846..6fbd1b3a 100644 --- a/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb +++ b/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true - +require 'cgi' require 'net/http' require 'uri' require 'json' From 3b12ac3f400cd01273e2b9a81152616bdede7486 Mon Sep 17 00:00:00 2001 From: Vijay N Date: Wed, 17 Jun 2026 16:10:38 +0530 Subject: [PATCH 5/9] Removed CGI change and updated killbill.sh to execute install plugin command --- docker/templates/killbill/latest/killbill.sh | 4 +++- kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/templates/killbill/latest/killbill.sh b/docker/templates/killbill/latest/killbill.sh index b65b3ef2..9829f1e4 100755 --- a/docker/templates/killbill/latest/killbill.sh +++ b/docker/templates/killbill/latest/killbill.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -ex +set -e echo "Installing plugins..." @@ -19,6 +19,8 @@ INSTALL_PLUGINS_CMD="$INSTALL_PLUGINS_CMD \ -e db_config_password=$KILLBILL_DAO_PASSWORD \ -e db_config_killbill_db_name=killbill" +eval "$INSTALL_PLUGINS_CMD" + originalfile=$KILLBILL_INSTALL_DIR/config/shiro.ini.template cat $originalfile | envsubst '${KB_ADMIN_PASSWORD}' > $KILLBILL_INSTALL_DIR/config/shiro.ini diff --git a/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb b/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb index 6fbd1b3a..5ba45846 100644 --- a/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb +++ b/kpm/lib/kpm/nexus_helper/maven_central_api_calls.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'cgi' + require 'net/http' require 'uri' require 'json' From d2d4f0c6d31653ec8b4cfa70f248d61a2b88135d Mon Sep 17 00:00:00 2001 From: Vijay N Date: Wed, 17 Jun 2026 18:43:45 +0530 Subject: [PATCH 6/9] Added a task to load Aviate variables defined in aws-marketplace. --- ansible/roles/killbill/tasks/plugins/aviate.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ansible/roles/killbill/tasks/plugins/aviate.yml b/ansible/roles/killbill/tasks/plugins/aviate.yml index 03fac9b5..341c8952 100644 --- a/ansible/roles/killbill/tasks/plugins/aviate.yml +++ b/ansible/roles/killbill/tasks/plugins/aviate.yml @@ -1,8 +1,12 @@ --- +- name: Load Aviate variables + ansible.builtin.include_vars: + file: {{ kb_install_dir }}/aviate-vars.yml + - name: Install Aviate plugin become: true ansible.builtin.command: | - "{{ kpm_path }}/kpm" install_java_plugin aviate --from-source-file={{ kb_plugins_dir }}/aviate-plugin.jar --destination={{ kb_plugins_dir }} + "{{ kpm_path }}/kpm" install_java_plugin aviate --from-source-file={{ kb_plugins_dir }}/aviate-plugin-{{ killbill_aviate_version }}.jar --destination={{ kb_plugins_dir }} args: creates: "{{ kb_plugins_dir }}/plugins/java/aviate-plugin" tags: From 9b706e7a2fd753e3592fcbde7de8adf5e2f53b33 Mon Sep 17 00:00:00 2001 From: Vijay N Date: Wed, 17 Jun 2026 18:59:47 +0530 Subject: [PATCH 7/9] Fixed the missing quotes bug --- ansible/roles/killbill/tasks/plugins/aviate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/killbill/tasks/plugins/aviate.yml b/ansible/roles/killbill/tasks/plugins/aviate.yml index 341c8952..185f0153 100644 --- a/ansible/roles/killbill/tasks/plugins/aviate.yml +++ b/ansible/roles/killbill/tasks/plugins/aviate.yml @@ -1,7 +1,7 @@ --- - name: Load Aviate variables ansible.builtin.include_vars: - file: {{ kb_install_dir }}/aviate-vars.yml + file: "{{ kb_install_dir }}/aviate-vars.yml" - name: Install Aviate plugin become: true From 60ea09d63fe9367a1ae09711e264e7fc727af764 Mon Sep 17 00:00:00 2001 From: Vijay N Date: Thu, 18 Jun 2026 16:21:05 +0530 Subject: [PATCH 8/9] Removed aviate-vars dependency and added a task to find Aviate jar --- ansible/roles/killbill/tasks/plugins/aviate.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ansible/roles/killbill/tasks/plugins/aviate.yml b/ansible/roles/killbill/tasks/plugins/aviate.yml index 185f0153..e279971d 100644 --- a/ansible/roles/killbill/tasks/plugins/aviate.yml +++ b/ansible/roles/killbill/tasks/plugins/aviate.yml @@ -1,12 +1,15 @@ --- -- name: Load Aviate variables - ansible.builtin.include_vars: - file: "{{ kb_install_dir }}/aviate-vars.yml" +- name: Find Aviate plugin JAR + ansible.builtin.find: + paths: "{{ kb_plugins_dir }}" + patterns: "aviate-plugin-*.jar" + file_type: file + register: aviate_plugin - name: Install Aviate plugin become: true ansible.builtin.command: | - "{{ kpm_path }}/kpm" install_java_plugin aviate --from-source-file={{ kb_plugins_dir }}/aviate-plugin-{{ killbill_aviate_version }}.jar --destination={{ kb_plugins_dir }} + "{{ kpm_path }}/kpm" install_java_plugin aviate --from-source-file={{ aviate_plugin.files[0].path }} --destination={{ kb_plugins_dir }} args: creates: "{{ kb_plugins_dir }}/plugins/java/aviate-plugin" tags: From bad6e3affc22b09b4b892956e810a1f207042e93 Mon Sep 17 00:00:00 2001 From: Vijay N Date: Thu, 18 Jun 2026 17:21:05 +0530 Subject: [PATCH 9/9] Fixed Ansible lint error --- ansible/roles/killbill/tasks/plugins/aviate.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/killbill/tasks/plugins/aviate.yml b/ansible/roles/killbill/tasks/plugins/aviate.yml index e279971d..549b1d4a 100644 --- a/ansible/roles/killbill/tasks/plugins/aviate.yml +++ b/ansible/roles/killbill/tasks/plugins/aviate.yml @@ -4,12 +4,12 @@ paths: "{{ kb_plugins_dir }}" patterns: "aviate-plugin-*.jar" file_type: file - register: aviate_plugin + register: killbill_aviate_plugin - name: Install Aviate plugin become: true ansible.builtin.command: | - "{{ kpm_path }}/kpm" install_java_plugin aviate --from-source-file={{ aviate_plugin.files[0].path }} --destination={{ kb_plugins_dir }} + "{{ kpm_path }}/kpm" install_java_plugin aviate --from-source-file={{ killbill_aviate_plugin.files[0].path }} --destination={{ kb_plugins_dir }} args: creates: "{{ kb_plugins_dir }}/plugins/java/aviate-plugin" tags: