Skip to content

Commit

Permalink
Merge pull request #650 from ystia/bugfix/GH-649_bootsrap_on_gcp_fails
Browse files Browse the repository at this point in the history
Fix Bootstrap on Centos 7 on GCP fails
  • Loading branch information
loicalbertin committed May 27, 2020
2 parents 45402f9 + a6b1c0e commit ded7b9b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

### BUG FIXES

* Bootstrap on Centos 7 on GCP fails ([GH-649](https://github.com/ystia/yorc/issues/649))
* Kubernetes Client uses deprecated apis removed on recent versions of K8S (v1.17+) ([GH-645](https://github.com/ystia/yorc/issues/645))
* Bootstrap may failed with a nil pointer error if download of a component fails ([GH-634](https://github.com/ystia/yorc/issues/634))
* Missing concurrency limit during data migration for logs and events file storage ([GH-640](https://github.com/ystia/yorc/issues/640))
Expand Down
Binary file modified commands/bootstrap/resources/topology/tosca_types.zip
Binary file not shown.
15 changes: 9 additions & 6 deletions doc/bootstrap.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@ The bootstrap was validated on:

* CentOS 7,
* Red Hat Enterprise Linux 7.5,
* Ubuntu 19.04 (which is installing python3 by default, see
* Ubuntu 19.04 (which is installing python3 by default, see
:ref:`bootstrap configuration file <yorc_google_example_ubuntu_section>`
example below for specific Ansible configuration settings needed for remote
example below for specific Ansible configuration settings needed for remote
hosts using python3).


.. warning:: For Centos and RHEL an access to an EPEL repository is required in order to install pip.

Packages
~~~~~~~~

Expand Down Expand Up @@ -272,7 +275,7 @@ for example :
type: openstack
properties:
auth_url: http://10.197.135.201:5000/v2.0
The bootstrap configuration file can be also be used to define Ansible Inventory
configuration parameters.
Expand Down Expand Up @@ -345,8 +348,8 @@ Example of a Google Cloud deployment configuration with Ubuntu 19.04 on-demand c

In this example, on-demand compute instances run Ubuntu 19.04 on which python3
is installed by default (and not python).
In this case, a specific Ansible behavioral inventory parameter
``ansible_python_interpreter`` must be defined so that Ansible is able to find
In this case, a specific Ansible behavioral inventory parameter
``ansible_python_interpreter`` must be defined so that Ansible is able to find
this python interpreter on the remote hosts.

.. code-block:: YAML
Expand Down Expand Up @@ -376,7 +379,7 @@ this python interpreter on the remote hosts.
# Defining here the Ansible behavioral inventory parameter ansible_python_interpreter
# pointing to python3.
# This is required or Ansible will attempt to use python on the remote host
# which will fail as python is not installed by default.
# which will fail as python is not installed by default.
"target_hosts:vars":
- ansible_python_interpreter=/usr/bin/python3
address:
Expand Down

0 comments on commit ded7b9b

Please sign in to comment.