From db9a574b1acd2a478e03b2e14743e6519ac7599f Mon Sep 17 00:00:00 2001 From: Otto Fowler Date: Wed, 11 Apr 2018 09:18:51 -0400 Subject: [PATCH 1/2] Support for Ansible 2.5.0 --- metron-deployment/amazon-ec2/README.md | 2 +- metron-deployment/amazon-ec2/playbook.yml | 4 ++-- metron-deployment/ansible/playbooks/metron_full_install.yml | 2 +- metron-deployment/development/centos6/README.md | 2 +- metron-deployment/development/ubuntu14/README.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/metron-deployment/amazon-ec2/README.md b/metron-deployment/amazon-ec2/README.md index bc259ec946..73a3d70a55 100644 --- a/metron-deployment/amazon-ec2/README.md +++ b/metron-deployment/amazon-ec2/README.md @@ -38,7 +38,7 @@ Getting Started The host used to deploy Apache Metron will need the following software tools installed. The following versions are known to work as of the time of this writing, but by no means are these the only working versions. - - Ansible 2.0.0.2 or 2.2.2.0 + - Ansible 2.0.0.2, 2.2.2.0, or 2.5.0 - Python 2.7.11 - Maven 3.3.9 diff --git a/metron-deployment/amazon-ec2/playbook.yml b/metron-deployment/amazon-ec2/playbook.yml index de6449018e..470a1816ba 100644 --- a/metron-deployment/amazon-ec2/playbook.yml +++ b/metron-deployment/amazon-ec2/playbook.yml @@ -23,8 +23,8 @@ - conf/defaults.yml pre_tasks: - name: Verify Ansible Version - fail: msg="Metron Requires Ansible 2.0.0.2 or 2.2.2.0, current version is {{ ansible_version }}" - when: "ansible_version.full | version_compare('2.2.2.0', '!=') and ansible_version.full | version_compare('2.0.0.2', '!=')" + fail: msg="Metron Requires Ansible 2.0.0.2, 2.2.2.0 or 2.5.0, current version is {{ ansible_version }}" + when: "ansible_version.full | version_compare('2.2.2.0', '!=') and ansible_version.full | version_compare('2.0.0.2', '!=') and ansible_version.full | version_compare('2.5.0', '!=')" tasks: - include: tasks/create-keypair.yml - include: tasks/create-vpc.yml diff --git a/metron-deployment/ansible/playbooks/metron_full_install.yml b/metron-deployment/ansible/playbooks/metron_full_install.yml index b517671d47..504ded7b85 100644 --- a/metron-deployment/ansible/playbooks/metron_full_install.yml +++ b/metron-deployment/ansible/playbooks/metron_full_install.yml @@ -19,7 +19,7 @@ pre_tasks: - name: Verify Ansible Version fail: msg="Metron Requires Ansible 2.0.0.2 or 2.2.2.0, current version is {{ ansible_version }}" - when: "ansible_version.full | version_compare('2.2.2.0', '!=') and ansible_version.full | version_compare('2.0.0.2', '!=')" + when: "ansible_version.full | version_compare('2.2.2.0', '!=') and ansible_version.full | version_compare('2.0.0.2', '!=') and ansible_version.full | version_compare('2.5.0', '!=')" - include: metron_build.yml tags: diff --git a/metron-deployment/development/centos6/README.md b/metron-deployment/development/centos6/README.md index bd8553cc49..ec85be3a00 100644 --- a/metron-deployment/development/centos6/README.md +++ b/metron-deployment/development/centos6/README.md @@ -29,7 +29,7 @@ Getting Started The computer used to deploy Apache Metron will need to have the following components installed. - - [Ansible](https://github.com/ansible/ansible) (2.0.0.2 or 2.2.2.0) + - [Ansible](https://github.com/ansible/ansible) (2.0.0.2, 2.2.2.0, or 2.5.0) - [Docker](https://www.docker.com/community-edition) - [Vagrant](https://www.vagrantup.com) 2.0+ - [Vagrant Hostmanager Plugin](https://github.com/devopsgroup-io/vagrant-hostmanager) diff --git a/metron-deployment/development/ubuntu14/README.md b/metron-deployment/development/ubuntu14/README.md index 585691107e..fbbd2addc0 100644 --- a/metron-deployment/development/ubuntu14/README.md +++ b/metron-deployment/development/ubuntu14/README.md @@ -29,7 +29,7 @@ Getting Started The computer used to deploy Apache Metron will need to have the following components installed. - - [Ansible](https://github.com/ansible/ansible) (2.0.0.2 or 2.2.2.0) + - [Ansible](https://github.com/ansible/ansible) (2.0.0.2, 2.2.2.0, or 2.5.0) - [Docker](https://www.docker.com/community-edition) - [Vagrant](https://www.vagrantup.com) 2.0+ - [Vagrant Hostmanager Plugin](https://github.com/devopsgroup-io/vagrant-hostmanager) From 287f7fea78968c2c3ccfabcbbde9ea44eb296150 Mon Sep 17 00:00:00 2001 From: Otto Fowler Date: Wed, 11 Apr 2018 09:36:59 -0400 Subject: [PATCH 2/2] missed error message --- metron-deployment/ansible/playbooks/metron_full_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metron-deployment/ansible/playbooks/metron_full_install.yml b/metron-deployment/ansible/playbooks/metron_full_install.yml index 504ded7b85..099d8104ed 100644 --- a/metron-deployment/ansible/playbooks/metron_full_install.yml +++ b/metron-deployment/ansible/playbooks/metron_full_install.yml @@ -18,7 +18,7 @@ - hosts: all pre_tasks: - name: Verify Ansible Version - fail: msg="Metron Requires Ansible 2.0.0.2 or 2.2.2.0, current version is {{ ansible_version }}" + fail: msg="Metron Requires Ansible 2.0.0.2, 2.2.2.0, or 2.5.0, current version is {{ ansible_version }}" when: "ansible_version.full | version_compare('2.2.2.0', '!=') and ansible_version.full | version_compare('2.0.0.2', '!=') and ansible_version.full | version_compare('2.5.0', '!=')" - include: metron_build.yml