Merge branch 'develop' into feature/GH-131-bootstrap-yorc

ystia · Dec 4, 2018 · 51724e2 · 51724e2
2 parents fb3052a + 900c9c2
commit 51724e2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## UNRELEASED
 
+### DEPENDENCIES
+
+* The orchestrator requires now at least Ansible 2.7.2 (upgrade from 2.6.3 introduced in [GH-194](https://github.com/ystia/yorc/issues/194))
+
 ### FEATURES
 
 * Allow to bootstrap a full stack Alien4Cloud/Yorc setup using yorc CLI ([GH-131](https://github.com/ystia/yorc/issues/131))

diff --git a/doc/upgrade.rst b/doc/upgrade.rst
@@ -37,12 +37,12 @@ Upgrading to Yorc 3.1.0
 Ansible
 ~~~~~~~
 
-Ansible needs to be upgraded to version 2.6.3, run the following command to
+Ansible needs to be upgraded to version 2.7.2, run the following command to
 do it:
 
 .. code-block:: bash
 
-    sudo pip install ansible==2.6.3
+    sudo pip install ansible==2.7.2
 
 Terraform
 ~~~~~~~~~
@@ -81,7 +81,7 @@ binary. So you also need to download them separately.
 Consul
 ~~~~~~
 
-Ansible needs to be upgraded to version 1.2.3, run the following command to
+Consul needs to be upgraded to version 1.2.3, run the following command to
 do it:
 
 .. code-block:: bash

diff --git a/pkg/Dockerfile b/pkg/Dockerfile
@@ -7,7 +7,7 @@ ARG TF_GOOGLE_PLUGIN_VERSION
 ARG TF_OPENSTACK_PLUGIN_VERSION
 # Update terraform default when possible
 ENV TERRAFORM_VERSION ${TERRAFORM_VERSION:-0.11.8}
-ENV ANSIBLE_VERSION ${ANSIBLE_VERSION:-2.6.3}
+ENV ANSIBLE_VERSION ${ANSIBLE_VERSION:-2.7.2}
 ENV TF_CONSUL_PLUGIN_VERSION ${TF_CONSUL_PLUGIN_VERSION:-2.1.0}
 ENV TF_AWS_PLUGIN_VERSION ${TF_AWS_PLUGIN_VERSION:-1.36.0}
 ENV TF_GOOGLE_PLUGIN_VERSION ${TF_GOOGLE_PLUGIN_VERSION:-1.18.0}

diff --git a/testdata/infra/openstack/yorc.tf b/testdata/infra/openstack/yorc.tf
@@ -138,7 +138,7 @@ resource "null_resource" "yorc-server-provisioning" {
       "sudo yum install -q -y python2-pip nfs-utils autofs",
       "cd /tmp && wget -q https://releases.hashicorp.com/terraform/0.9.11/terraform_0.9.11_linux_amd64.zip && sudo unzip /tmp/terraform_0.9.11_linux_amd64.zip -d /usr/local/bin",
       "sudo -H pip install -q pip --upgrade",
-      "sudo -H pip install -q ansible==2.6.3",
+      "sudo -H pip install -q ansible==2.7.2",
       "mv /tmp/config.yorc.json ~/config.yorc.json",
       "echo -e '/-    /etc/auto.direct\n' | sudo tee /etc/auto.master > /dev/null",
       "cat /tmp/auto.yorc | sudo tee /etc/auto.direct > /dev/null",

diff --git a/versions.yaml b/versions.yaml
@@ -1,7 +1,7 @@
 yorc_version: 3.1.0-SNAPSHOT
 consul_version: 1.2.3
 terraform_version: 0.11.8
-ansible_version: 2.6.3
+ansible_version: 2.7.2
 tf_consul_plugin_version: 2.1.0
 tf_aws_plugin_version: 1.36.0
 tf_openstack_plugin_version: 1.9.0