Skip to content
32 changes: 7 additions & 25 deletions ansible/roles/killbill/tasks/plugins/aviate.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,15 @@
---
- 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('<release>(.*)</release>', '\\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: Find Aviate plugin JAR
ansible.builtin.find:
paths: "{{ kb_plugins_dir }}"
patterns: "aviate-plugin-*.jar"
file_type: file
register: killbill_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={{ killbill_aviate_plugin.files[0].path }} --destination={{ kb_plugins_dir }}
args:
creates: "{{ kb_plugins_dir }}/plugins/java/aviate-plugin"
tags:
Expand Down
2 changes: 1 addition & 1 deletion docker/templates/base/latest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down
4 changes: 3 additions & 1 deletion docker/templates/killbill/latest/killbill.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

set -ex
set -e

echo "Installing plugins..."

Expand All @@ -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

Expand Down
Loading