Repository: metron Updated Branches: refs/heads/master 6ca08b9f5 -> d9ed1bad1
METRON-1349 Full Dev Builds Metron Twice (nickwallen) closes apache/metron#866 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/d9ed1bad Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/d9ed1bad Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/d9ed1bad Branch: refs/heads/master Commit: d9ed1bad1f5b2e2471fbea11353f2947f7f52e13 Parents: 6ca08b9 Author: nickwallen <n...@nickallen.org> Authored: Thu Dec 14 10:59:27 2017 -0500 Committer: nickallen <nickal...@apache.org> Committed: Thu Dec 14 10:59:27 2017 -0500 ---------------------------------------------------------------------- metron-deployment/playbooks/ambari_install.yml | 16 ------------- metron-deployment/playbooks/metron_build.yml | 2 ++ metron-deployment/playbooks/metron_install.yml | 25 ++++++++++++++------ .../roles/ambari_config/tasks/main.yml | 11 ++++----- .../roles/ambari_master/tasks/main.yml | 3 --- metron-deployment/roles/epel/tasks/main.yml | 4 +--- 6 files changed, 25 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/d9ed1bad/metron-deployment/playbooks/ambari_install.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/playbooks/ambari_install.yml b/metron-deployment/playbooks/ambari_install.yml index 51aa907..c0cfef3 100644 --- a/metron-deployment/playbooks/ambari_install.yml +++ b/metron-deployment/playbooks/ambari_install.yml @@ -29,7 +29,6 @@ tags: - packer - - hosts: ambari_* become: true roles: @@ -60,18 +59,3 @@ - role: metron-rpms tags: - metron-deploy - -- hosts: ambari_master - become: true - roles: - - role: ambari_config - tags: - - hdp-install - - hdp-deploy - -- hosts: ambari_master - become: true - roles: - - role: load_web_templates - tags: - - load_templates http://git-wip-us.apache.org/repos/asf/metron/blob/d9ed1bad/metron-deployment/playbooks/metron_build.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/playbooks/metron_build.yml b/metron-deployment/playbooks/metron_build.yml index 70d2ae5..83eb352 100644 --- a/metron-deployment/playbooks/metron_build.yml +++ b/metron-deployment/playbooks/metron_build.yml @@ -19,3 +19,5 @@ become: false roles: - role: metron-builder + tags: + - build http://git-wip-us.apache.org/repos/asf/metron/blob/d9ed1bad/metron-deployment/playbooks/metron_install.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/playbooks/metron_install.yml b/metron-deployment/playbooks/metron_install.yml index 998394d..bed615e 100644 --- a/metron-deployment/playbooks/metron_install.yml +++ b/metron-deployment/playbooks/metron_install.yml @@ -15,13 +15,6 @@ # limitations under the License. # --- -- hosts: metron - become: true - roles: - - { role: ambari_slave } - - { role: metron-builder, tags: ['build'] } - - { role: metron-rpms } - - hosts: ec2 become: true tasks: @@ -36,6 +29,24 @@ tags: - packer +# +# start installation of components in Ambari +# +- hosts: ambari_master + become: true + roles: + - role: ambari_config + tags: + - hdp-install + - hdp-deploy + +- hosts: ambari_master + become: true + roles: + - role: load_web_templates + tags: + - load_templates + - hosts: pcap_server become: true roles: http://git-wip-us.apache.org/repos/asf/metron/blob/d9ed1bad/metron-deployment/roles/ambari_config/tasks/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/roles/ambari_config/tasks/main.yml b/metron-deployment/roles/ambari_config/tasks/main.yml index aa1004c..6588d4a 100644 --- a/metron-deployment/roles/ambari_config/tasks/main.yml +++ b/metron-deployment/roles/ambari_config/tasks/main.yml @@ -26,16 +26,15 @@ retries: 5 delay: 10 -- name : check if ambari-server is up on {{ ambari_host }}:{{ambari_port}} +- name : Wait for Ambari to start; http://{{ ambari_host }}:{{ ambari_port }} wait_for : host: "{{ ambari_host }}" port: "{{ ambari_port }}" - delay: 120 - timeout: 300 + timeout: 600 -- name: Deploy cluster with Ambari; http://{{ groups.ambari_master[0] }}:{{ ambari_port }} +- name: Deploy cluster with Ambari; http://{{ ambari_host }}:{{ ambari_port }} ambari_cluster_state: - host: "{{ groups.ambari_master[0] }}" + host: "{{ ambari_host }}" port: "{{ ambari_port }}" username: "{{ ambari_user }}" password: "{{ ambari_password }}" @@ -45,5 +44,3 @@ configurations: "{{ configurations }}" wait_for_complete: True blueprint_var: "{{ blueprint }}" - - http://git-wip-us.apache.org/repos/asf/metron/blob/d9ed1bad/metron-deployment/roles/ambari_master/tasks/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/roles/ambari_master/tasks/main.yml b/metron-deployment/roles/ambari_master/tasks/main.yml index d2ff4d5..e4b3dd1 100644 --- a/metron-deployment/roles/ambari_master/tasks/main.yml +++ b/metron-deployment/roles/ambari_master/tasks/main.yml @@ -19,8 +19,6 @@ - name: Install ambari server yum: name: ambari-server - state: present - update_cache: yes register: result until: result.rc == 0 retries: 5 @@ -52,4 +50,3 @@ service: name: ambari-server state: restarted - http://git-wip-us.apache.org/repos/asf/metron/blob/d9ed1bad/metron-deployment/roles/epel/tasks/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/roles/epel/tasks/main.yml b/metron-deployment/roles/epel/tasks/main.yml index 90ae598..0962e40 100644 --- a/metron-deployment/roles/epel/tasks/main.yml +++ b/metron-deployment/roles/epel/tasks/main.yml @@ -16,6 +16,4 @@ # --- - name: Install EPEL repository - yum: name=epel-release update_cache=yes - - + yum: name=epel-release
