Adding develop branch variables
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/475f6875 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/475f6875 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/475f6875 Branch: refs/heads/develop Commit: 475f687529e5547ef9ae3c13850536edea863012 Parents: fec0b37 Author: Shameera Rathnayaka <[email protected]> Authored: Tue Sep 13 13:36:03 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Tue Sep 13 13:36:03 2016 -0400 ---------------------------------------------------------------------- group_vars/all.yml | 9 +++++---- roles/database/tasks/main.yml | 3 +-- site.yml | 8 ++++++++ 3 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/475f6875/group_vars/all.yml ---------------------------------------------------------------------- diff --git a/group_vars/all.yml b/group_vars/all.yml index 615085a..b1efac4 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -1,7 +1,8 @@ --- ansible_connection: ssh ansible_ssh_user: centos -#ansible_ssh_private_key_file: /Users/syodage/Projects/scigap/JetCloud/jetcloud.key +# ansible_ssh_user: root +# ansible_ssh_private_key_file: /Users/syodage/Projects/scigap/JetCloud/jetcloud.key ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/shameera-aws.pem.txt user: centos @@ -9,11 +10,11 @@ group: centos user_home: "/home/{{ user }}" # deployment related variables -deployment_dir: "{{ user_home }}/master-deployment" +deployment_dir: "{{ user_home }}/dev-deployment" airavata_source_dir: "{{ user_home }}/source" airavata_dist: "apache-airavata-server-0.17-SNAPSHOT" airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz" -git_branch: master +git_branch: develop # Database related variables db_server: "{{ groups['database'][0] }}" @@ -30,7 +31,7 @@ mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar" # Rabbitmq related vareables rabbitmq_server: "{{ groups['rabbitmq'][0] }}" -rabbitmq_vhost: "master" +rabbitmq_vhost: "develop" rabbitmq_user: "airavata" rabbitmq_password: "airavata" rabbitmq_port: "5672" http://git-wip-us.apache.org/repos/asf/airavata/blob/475f6875/roles/database/tasks/main.yml ---------------------------------------------------------------------- diff --git a/roles/database/tasks/main.yml b/roles/database/tasks/main.yml index 4a75abb..8a02227 100644 --- a/roles/database/tasks/main.yml +++ b/roles/database/tasks/main.yml @@ -45,7 +45,7 @@ with_items: - "{{ groups['api-orch'] }}" - "{{ groups['gfac'] }}" - tags: testdb + - "{{ groups['registry'] }}" - name: create new user {{ db_user }} with all privilege mysql_user: name="{{ db_user }}" @@ -53,7 +53,6 @@ append_privs=yes host_all=yes priv=*.*:ALL,GRANT state=present - tags: testdb - name: open firewall port {{ db_server_port }} firewalld: port="{{ db_server_port }}/tcp" http://git-wip-us.apache.org/repos/asf/airavata/blob/475f6875/site.yml ---------------------------------------------------------------------- diff --git a/site.yml b/site.yml index a9472dd..036229c 100644 --- a/site.yml +++ b/site.yml @@ -42,6 +42,14 @@ - common - api-orch +- hosts: registry + tags: registry, airavata + roles: + - env_setup + - java + - common + - registry + - hosts: pga tags: pga roles:
