Merge pull request #86 from giraffeforestg/activemq-version-variable

Changed activemq version from fixed value to variable in installer
personium · Apr 3, 2019 · 8f2978c · 8f2978c
2 parents 9a082b2 + 2a07de8
commit 8f2978c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/3-server_unit/group_vars/ap.yml b/3-server_unit/group_vars/ap.yml
@@ -19,3 +19,4 @@ cache_manager: memcached
 
 tomcat_version: 9.0.10
 commons_daemon_version : 1.1.0
+activemq_version: 5.15.2
diff --git a/3-server_unit/tasks/ap/init_activemq_install.yml b/3-server_unit/tasks/ap/init_activemq_install.yml
@@ -3,20 +3,20 @@
 - name: Create download directory
   file: "state=directory path=/usr/local/src/activemq owner=root group=root"
 
-- name: Download apache-activemq-5.15.2-bin.tar.gz
-  command: wget -q -O apache-activemq-5.15.2-bin.tar.gz --no-check-certificate http://archive.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz
+- name: Download apache-activemq-{{ activemq_version }}-bin.tar.gz
+  command: wget -q -O apache-activemq-{{ activemq_version }}-bin.tar.gz --no-check-certificate http://archive.apache.org/dist/activemq/{{ activemq_version }}/apache-activemq-{{ activemq_version }}-bin.tar.gz
   args:
     chdir: /usr/local/src/activemq
-    creates: /usr/local/src/activemq/apache-activemq-5.15.2-bin.tar.gz
+    creates: /usr/local/src/activemq/apache-activemq-{{ activemq_version }}-bin.tar.gz
 
-- name: Expand apache-activemq-5.15.2-bin.tar.gz
-  unarchive: src=/usr/local/src/activemq/apache-activemq-5.15.2-bin.tar.gz dest=/usr/local/src/activemq copy=no
+- name: Expand apache-activemq-{{ activemq_version }}-bin.tar.gz
+  unarchive: src=/usr/local/src/activemq/apache-activemq-{{ activemq_version }}-bin.tar.gz dest=/usr/local/src/activemq copy=no
 
 - name: Deploy activemq
-  command: mv /usr/local/src/activemq/apache-activemq-5.15.2 /opt/apache-activemq-5.15.2 creates="/opt/apache-activemq-5.15.2"
+  command: mv /usr/local/src/activemq/apache-activemq-{{ activemq_version }} /opt/apache-activemq-{{ activemq_version }} creates="/opt/apache-activemq-{{ activemq_version }}"
 
 - name: Create symlink /opt/activemq
-  file: state=link src=/opt/apache-activemq-5.15.2 dest=/opt/activemq owner=root group=root mode=0777
+  file: state=link src=/opt/apache-activemq-{{ activemq_version }} dest=/opt/activemq owner=root group=root mode=0777
 
 - name: Deploy /etc/systemd/system/activemq.service
   copy: src=./resource/ap/etc/systemd/system/activemq.service dest=/etc/systemd/system/activemq.service  owner=root group=root mode=0755
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@ cache_manager: memcached

		tomcat_version: 9.0.10
		commons_daemon_version : 1.1.0
		activemq_version: 5.15.2