You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/09/24 01:58:35 UTC
[10/29] airavata git commit: Rename setup to evn_setup
Rename setup to evn_setup
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/22a68ccb
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/22a68ccb
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/22a68ccb
Branch: refs/heads/develop
Commit: 22a68ccb3456972e2137d4c2c94bc7b1e736533e
Parents: cf8be0d
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Aug 1 14:32:07 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Aug 1 14:32:07 2016 -0400
----------------------------------------------------------------------
README.md | 2 +-
roles/env_setup/tasks/main.yml | 44 +++++++++++++++++++++++++++++++++++
roles/env_setup/tasks/redhat.yml | 12 ++++++++++
roles/env_setup/vars/main.yml | 15 ++++++++++++
roles/setup/tasks/main.yml | 44 -----------------------------------
roles/setup/tasks/redhat.yml | 12 ----------
roles/setup/vars/main.yml | 15 ------------
site.yml | 8 +++----
8 files changed, 76 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/22a68ccb/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 072a50f..f497fb5 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Ansible script to deploy Apache Airavata
## Roles
-- **setup** :- Create user and group, install oracle java 8
+- **env_setup** :- Create user and group, install oracle java 8
- **zookeeper** :- Download and install zookeeper.
- **rabbitmq** :- Download and install rabbitmq as service.
- **common** :- Checkout Airavata source from git and run maven build. Move keystore files.
http://git-wip-us.apache.org/repos/asf/airavata/blob/22a68ccb/roles/env_setup/tasks/main.yml
----------------------------------------------------------------------
diff --git a/roles/env_setup/tasks/main.yml b/roles/env_setup/tasks/main.yml
new file mode 100644
index 0000000..a20b018
--- /dev/null
+++ b/roles/env_setup/tasks/main.yml
@@ -0,0 +1,44 @@
+---
+#Tasks file can include smaller files if wanted
+#All commons tasks goes here
+- name: Create a new user group "{{ group }}"
+ group: name={{ group }}
+ tags: user
+
+- name: Create a new user "{{ user }}"
+ user: name={{ user }} group={{ group }}
+ tags: user
+
+################################################################################
+- name: Install git latest version
+ yum: name=git state=latest update_cache=yes
+ tags: env
+
+- name: Install maven latest version
+ yum: name=maven state=latest update_cache=yes
+ tags: env
+
+################################################################################
+# Install Orcal Java
+- name: download oracle java 8 rpm
+ get_url: url="{{ java_rpm_url }}" dest="{{ java_dir_source }}" headers='Cookie:oraclelicense=accept-securebackup-cookie'
+ tags: env
+
+- name: Install oracle java 8
+ yum: name="{{ java_dir_source }}/{{ java_rpm_filename }}" state=present
+ tags: env
+
+- name: set Java version as default
+ alternatives:
+ name="{{ item.exe }}"
+ link="/usr/bin/{{ item.exe }}"
+ path="{{ item.path }}/{{ item.exe }}"
+ with_items:
+ - { path: "{{ java_home }}/jre/bin", exe: 'java' }
+ - { path: "{{ java_home }}/jre/bin", exe: 'keytool' }
+ - { path: "{{ java_home }}/bin", exe: 'javac' }
+ - { path: "{{ java_home }}/bin", exe: 'javadoc' }
+ tags: env
+
+# End
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/22a68ccb/roles/env_setup/tasks/redhat.yml
----------------------------------------------------------------------
diff --git a/roles/env_setup/tasks/redhat.yml b/roles/env_setup/tasks/redhat.yml
new file mode 100644
index 0000000..a0e56c7
--- /dev/null
+++ b/roles/env_setup/tasks/redhat.yml
@@ -0,0 +1,12 @@
+---
+- name: Install git latest version
+ yum: name=git state=latest update_cache=yes
+# become: true
+# become_user: airavata
+ tags: env_setup
+
+- name: Install maven latest version
+ yum: name=maven state=latest update_cache=yes
+ tags: env_setup
+
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/22a68ccb/roles/env_setup/vars/main.yml
----------------------------------------------------------------------
diff --git a/roles/env_setup/vars/main.yml b/roles/env_setup/vars/main.yml
new file mode 100644
index 0000000..a995684
--- /dev/null
+++ b/roles/env_setup/vars/main.yml
@@ -0,0 +1,15 @@
+---
+#Variables associated with this role
+# Oracle Java 8
+java_dir_source: "/usr/local/src"
+
+java_version: 8
+java_version_update: 91
+java_version_build: '14'
+java_version_string: "1.{{ java_version }}.0_{{ java_version_update }}"
+java_home: "/usr/java/jdk1.{{ java_version }}.0_{{ java_version_update }}"
+
+java_rpm_filename: "jdk-{{ java_version }}u{{ java_version_update }}-linux-x64.rpm"
+java_rpm_url: "http://download.oracle.com/otn-pub/java/jdk/{{ java_version }}u{{ java_version_update }}-b{{ java_version_build }}/{{ java_rpm_filename }}"
+
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/22a68ccb/roles/setup/tasks/main.yml
----------------------------------------------------------------------
diff --git a/roles/setup/tasks/main.yml b/roles/setup/tasks/main.yml
deleted file mode 100644
index a20b018..0000000
--- a/roles/setup/tasks/main.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-#Tasks file can include smaller files if wanted
-#All commons tasks goes here
-- name: Create a new user group "{{ group }}"
- group: name={{ group }}
- tags: user
-
-- name: Create a new user "{{ user }}"
- user: name={{ user }} group={{ group }}
- tags: user
-
-################################################################################
-- name: Install git latest version
- yum: name=git state=latest update_cache=yes
- tags: env
-
-- name: Install maven latest version
- yum: name=maven state=latest update_cache=yes
- tags: env
-
-################################################################################
-# Install Orcal Java
-- name: download oracle java 8 rpm
- get_url: url="{{ java_rpm_url }}" dest="{{ java_dir_source }}" headers='Cookie:oraclelicense=accept-securebackup-cookie'
- tags: env
-
-- name: Install oracle java 8
- yum: name="{{ java_dir_source }}/{{ java_rpm_filename }}" state=present
- tags: env
-
-- name: set Java version as default
- alternatives:
- name="{{ item.exe }}"
- link="/usr/bin/{{ item.exe }}"
- path="{{ item.path }}/{{ item.exe }}"
- with_items:
- - { path: "{{ java_home }}/jre/bin", exe: 'java' }
- - { path: "{{ java_home }}/jre/bin", exe: 'keytool' }
- - { path: "{{ java_home }}/bin", exe: 'javac' }
- - { path: "{{ java_home }}/bin", exe: 'javadoc' }
- tags: env
-
-# End
-...
http://git-wip-us.apache.org/repos/asf/airavata/blob/22a68ccb/roles/setup/tasks/redhat.yml
----------------------------------------------------------------------
diff --git a/roles/setup/tasks/redhat.yml b/roles/setup/tasks/redhat.yml
deleted file mode 100644
index a0e56c7..0000000
--- a/roles/setup/tasks/redhat.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Install git latest version
- yum: name=git state=latest update_cache=yes
-# become: true
-# become_user: airavata
- tags: env_setup
-
-- name: Install maven latest version
- yum: name=maven state=latest update_cache=yes
- tags: env_setup
-
-...
http://git-wip-us.apache.org/repos/asf/airavata/blob/22a68ccb/roles/setup/vars/main.yml
----------------------------------------------------------------------
diff --git a/roles/setup/vars/main.yml b/roles/setup/vars/main.yml
deleted file mode 100644
index a995684..0000000
--- a/roles/setup/vars/main.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-#Variables associated with this role
-# Oracle Java 8
-java_dir_source: "/usr/local/src"
-
-java_version: 8
-java_version_update: 91
-java_version_build: '14'
-java_version_string: "1.{{ java_version }}.0_{{ java_version_update }}"
-java_home: "/usr/java/jdk1.{{ java_version }}.0_{{ java_version_update }}"
-
-java_rpm_filename: "jdk-{{ java_version }}u{{ java_version_update }}-linux-x64.rpm"
-java_rpm_url: "http://download.oracle.com/otn-pub/java/jdk/{{ java_version }}u{{ java_version_update }}-b{{ java_version_build }}/{{ java_rpm_filename }}"
-
-...
http://git-wip-us.apache.org/repos/asf/airavata/blob/22a68ccb/site.yml
----------------------------------------------------------------------
diff --git a/site.yml b/site.yml
index 728d3f0..d86dac0 100644
--- a/site.yml
+++ b/site.yml
@@ -3,26 +3,26 @@
- hosts: zookeeper
tags: zookeeper
roles:
- - setup
+ - env_setup
- zookeeper
- hosts: rabbitmq
tags: rabbitmq
roles:
- - setup
+ - env_setup
- rabbitmq
- hosts: gfac
tags: gfac
roles:
- - setup
+ - env_setup
- common
- gfac
- hosts: api-orch
tags: api-orch
roles:
- - setup
+ - env_setup
- common
- api-orch