Skip to content

Commit 2882970

Browse files
author
ROSSO, LOIC
committed
Merge branch 'develop' of github.com:ystia/forge into feature/GH-127-ansible-vault-component
2 parents 6c802c8 + 2ff2f3a commit 2882970

File tree

121 files changed

+642
-570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+642
-570
lines changed

CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
## UNRELEASED
44

5+
### ENHANCEMENTS
6+
7+
* Add docker container property to set the shared memory size ([GH-129](https://github.com/ystia/forge/issues/129))
8+
9+
### BUG FIXES
10+
11+
* Installation of Consul and Ansible fails on recent Centos for GCP images ([GH-131](https://github.com/ystia/forge/issues/131))
12+
13+
## 2.2.0 (April 17, 2020)
14+
515
### NEW COMPONENTS
616

717
* Failure starting a docker container in attached mode ([GH-119](https://github.com/ystia/forge/issues/119))

org/ystia/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ For the second method:
133133

134134
- Repository URL: https://github.com/alien4cloud/csar-public-library.git
135135
- Credentials: *none*
136-
- Branch: **v2.1.0**
136+
- Branch: **v2.2.0**
137137
- Archives to import:
138138

139139
- **org/alien4cloud/consul**

org/ystia/alien/docker/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ The deployment to Kubernetes can be done using Alien4Cloud and Yorc.
99

1010
## About used versions
1111

12-
1. Used Alien version: 2.2.0-SM10 (docker-types:2.2.0-SM10)
13-
2. Deployed Alien version: 2.2.0-SM10 (file: alien4cloud/alien4cloud:2.2.0-SM10)
12+
1. Used Alien version: 2.2.0 (docker-types:2.2.0)
13+
2. Deployed Alien version: 2.2.0 (file: alien4cloud/alien4cloud:2.2.0)
1414

1515
## Usage
1616

1717
Check used versions, and if necessary modify them correspondingly to your needs.
1818
Create a zip file with the types.yaml and upload it to the used Alien4Cloud's Catalog.
19-
19+

org/ystia/alien/docker/types.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ metadata:
2222

2323
imports:
2424
- tosca-normative-types:1.0.0-ALIEN20
25-
- docker-types:2.2.0-SM10
25+
- docker-types:2.2.0
2626
- org.ystia.yorc.docker:1.0.0-SNAPSHOT
2727

2828
description: Alien4cloud container provided by Ystia to be deployed to K8S together with a Yorc container
@@ -36,7 +36,7 @@ node_types:
3636
org.ystia.alien.docker.nodes.Alien:
3737
derived_from: tosca.nodes.Container.Application.DockerContainer
3838
properties:
39-
nb_retry:
39+
nb_retry:
4040
description: number tentatives to connect to Yorc orchestrator
4141
type: integer
4242
required: false

org/ystia/ansible/linux/ansible/playbooks/create.yml

+26-29
Original file line numberDiff line numberDiff line change
@@ -20,50 +20,47 @@
2020
become: true
2121
become_method: sudo
2222
tasks:
23-
- name: Load a variable file based on the OS type, or a default if not found. Using free-form to specify the file.
23+
24+
- name: Get python version
25+
# This will be deprecated in Ansible 2.9 in favor of python_requirements_info but
26+
# it is not yet available in Ansible 2.7.9
27+
python_requirements_facts:
28+
register: pri
29+
failed_when: "pri == None or pri.python_version == None or pri.python_version == ''"
30+
31+
- name: Load a variable file based on the OS type.
2432
include_vars:
2533
file: "{{ item }}"
2634
with_first_found:
27-
- "vars/{{ ansible_distribution }}.yml"
28-
- "vars/{{ ansible_os_family }}.yml"
35+
- "vars/{{ ansible_os_family }}-py{{pri.python_version | replace('\n', '') | regex_replace('^(\\d+).*', '\\1') }}.yml"
36+
- "vars/{{ ansible_os_family }}-py{{pri.python_version | replace('\n', '') | regex_replace('^(\\d+).*', '\\1') }}.yml"
2937

30-
- name: install prerequirements
31-
package:
32-
name: "{{item}}"
38+
- name: RedHat - install prerequisites
39+
yum:
40+
name: "{{install_packages}}"
3341
state: present
34-
with_items: "{{install_packages}}"
35-
36-
- name: Check if distribution has easy_install or needs a pip3 installation
37-
set_fact:
38-
easy_install_available: "{{ ansible_distribution != 'Ubuntu' or ansible_distribution_major_version is version(18, '<') }}"
42+
update_cache: yes
43+
when: ansible_os_family == 'RedHat'
3944

40-
- name: Ensure pip is installed using easy_install when availabe
41-
easy_install:
42-
name: pip
43-
state: latest
44-
when: easy_install_available
4545

46-
- name: Install python3-pip when easy_install in not available
46+
- name: Debian - install prerequisites
4747
apt:
48-
name:
49-
- python3-pip
48+
name: "{{ install_packages }}"
5049
state: present
5150
update_cache: yes
52-
when: not easy_install_available
51+
when: ansible_os_family == 'Debian'
5352

54-
- name: install using pip
53+
- name: Install latest Pip version
5554
pip:
56-
name:
57-
- "ansible=={{ANSIBLE_VERSION}}"
58-
- "jmespath==0.9.4"
59-
- "netaddr==0.7.19"
60-
when: ANSIBLE_EXTRA_PACKAGE_REPOSITORY == ""
55+
name: "pip"
56+
state: latest
57+
executable: "{{pip_cmd}}"
6158

62-
- name: install using pip package repository "{{ANSIBLE_EXTRA_PACKAGE_REPOSITORY}}"
59+
- name: install Ansible using Pip
6360
pip:
6461
name:
6562
- "ansible=={{ANSIBLE_VERSION}}"
6663
- "jmespath==0.9.4"
6764
- "netaddr==0.7.19"
68-
extra_args: --extra-index-url "{{ANSIBLE_EXTRA_PACKAGE_REPOSITORY}}"
69-
when: ANSIBLE_EXTRA_PACKAGE_REPOSITORY != ""
65+
executable: "{{pip_cmd}}"
66+
extra_args: "{{ '--extra-index-url {}'.format(ANSIBLE_EXTRA_PACKAGE_REPOSITORY) if ANSIBLE_EXTRA_PACKAGE_REPOSITORY != '' else ''}}"

org/ystia/ansible/linux/ansible/playbooks/vars/Debian.yml org/ystia/ansible/linux/ansible/playbooks/vars/Debian-py2.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ install_packages:
1919
- make
2020
- python2
2121
- python2-dev
22-
- virtualenv
22+
- python-pip
23+
24+
pip_cmd: "pip"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#
2+
# Copyright 2018 Bull S.A.S. Atos Technologies - Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois, France.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
install_packages:
18+
- gcc
19+
- make
20+
- python3
21+
- python3-dev
22+
- python3-pip
23+
24+
pip_cmd: "pip3"

org/ystia/ansible/linux/ansible/playbooks/vars/RedHat.yml org/ystia/ansible/linux/ansible/playbooks/vars/RedHat-py2.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ install_packages:
1919
- make
2020
- python2
2121
- python2-devel
22-
- python-virtualenv
22+
- python-pip
23+
24+
pip_cmd: "pip"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#
2+
# Copyright 2018 Bull S.A.S. Atos Technologies - Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois, France.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
install_packages:
18+
- gcc
19+
- make
20+
- python3
21+
- python3-devel
22+
- python3-pip
23+
24+
pip_cmd: "pip3"

org/ystia/ansible/linux/ansible/types.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ tosca_definitions_version: alien_dsl_2_0_0
1717

1818
metadata:
1919
template_name: org.ystia.ansible.linux.ansible
20-
template_version: 2.2.0-SNAPSHOT
20+
template_version: 2.3.0-SNAPSHOT
2121
template_author: yorc
2222

2323
imports:
2424
- tosca-normative-types:1.0.0-ALIEN20
2525
- yorc-types:1.1.0
26-
- org.ystia.ansible.pub:2.2.0-SNAPSHOT
26+
- org.ystia.ansible.pub:2.3.0-SNAPSHOT
2727

2828
node_types:
2929
org.ystia.ansible.linux.ansible.nodes.AnsibleRuntime:

org/ystia/ansible/pub/types.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tosca_definitions_version: alien_dsl_2_0_0
1717

1818
metadata:
1919
template_name: org.ystia.ansible.pub
20-
template_version: 2.2.0-SNAPSHOT
20+
template_version: 2.3.0-SNAPSHOT
2121
template_author: yorc
2222

2323
imports:

org/ystia/beats/linux/bash/types.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ tosca_definitions_version: alien_dsl_2_0_0
88

99
metadata:
1010
template_name: org.ystia.beats.linux.bash
11-
template_version: 2.2.0-SNAPSHOT
11+
template_version: 2.3.0-SNAPSHOT
1212
template_author: Ystia
1313

1414
description: Beats are data shippers for many types of data you want to enrich with Logstash, search and analyze in Elasticsearch, and visualize in Kibana.
1515

1616
imports:
1717
- tosca-normative-types:1.0.0-ALIEN20
18-
- org.ystia.consul.pub:2.2.0-SNAPSHOT
19-
- org.ystia.elasticsearch.pub:2.2.0-SNAPSHOT
20-
- org.ystia.logstash.pub:2.2.0-SNAPSHOT
18+
- org.ystia.consul.pub:2.3.0-SNAPSHOT
19+
- org.ystia.elasticsearch.pub:2.3.0-SNAPSHOT
20+
- org.ystia.logstash.pub:2.3.0-SNAPSHOT
2121

2222
node_types:
2323
org.ystia.beats.linux.bash.nodes.Beat:

org/ystia/cloudera/linux/bash/types.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ tosca_definitions_version: alien_dsl_2_0_0
88

99
metadata:
1010
template_name: org.ystia.cloudera.linux.bash
11-
template_version: 2.2.0-SNAPSHOT
11+
template_version: 2.3.0-SNAPSHOT
1212
template_author: Ystia
1313

1414
description: Cloudera big data distribution for Linux system
1515

1616

1717
imports:
1818
- tosca-normative-types:1.0.0-ALIEN20
19-
- org.ystia.common:2.2.0-SNAPSHOT
20-
- org.ystia.consul.pub:2.2.0-SNAPSHOT
21-
- org.ystia.cloudera.pub:2.2.0-SNAPSHOT
19+
- org.ystia.common:2.3.0-SNAPSHOT
20+
- org.ystia.consul.pub:2.3.0-SNAPSHOT
21+
- org.ystia.cloudera.pub:2.3.0-SNAPSHOT
2222

2323
node_types:
2424
org.ystia.cloudera.linux.bash.nodes.ClouderaServer:

org/ystia/cloudera/pub/types.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
88

99
metadata:
1010
template_name: org.ystia.cloudera.pub
11-
template_version: 2.2.0-SNAPSHOT
11+
template_version: 2.3.0-SNAPSHOT
1212
template_author: Ystia
1313

1414
description: Public interface types for Cloudera support.
1515

1616
imports:
1717
- tosca-normative-types:1.0.0-ALIEN20
18-
- org.ystia.common:2.2.0-SNAPSHOT
18+
- org.ystia.common:2.3.0-SNAPSHOT
1919

2020
capability_types:
2121
org.ystia.cloudera.pub.capabilities.ClouderaServerEndpoint:

org/ystia/common/types.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
88

99
metadata:
1010
template_name: org.ystia.common
11-
template_version: 2.2.0-SNAPSHOT
11+
template_version: 2.3.0-SNAPSHOT
1212
template_author: Ystia
1313

1414
description: common part of all ystia components

org/ystia/consul/linux/bash/types.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ tosca_definitions_version: alien_dsl_2_0_0
88

99
metadata:
1010
template_name: org.ystia.consul.linux.bash
11-
template_version: 2.2.0-SNAPSHOT
11+
template_version: 2.3.0-SNAPSHOT
1212
template_author: Ystia
1313

1414
description: Consul agent and server
1515

1616
imports:
1717
- tosca-normative-types:1.0.0-ALIEN20
18-
- org.ystia.common:2.2.0-SNAPSHOT
19-
- org.ystia.consul.pub:2.2.0-SNAPSHOT
18+
- org.ystia.common:2.3.0-SNAPSHOT
19+
- org.ystia.consul.pub:2.3.0-SNAPSHOT
2020

2121
node_types:
2222
org.ystia.consul.linux.bash.nodes.Consul:

org/ystia/consul/pub/types.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
88

99
metadata:
1010
template_name: org.ystia.consul.pub
11-
template_version: 2.2.0-SNAPSHOT
11+
template_version: 2.3.0-SNAPSHOT
1212
template_author: Ystia
1313

1414
description: Public interface types for Consul support.
1515

1616
imports:
1717
- tosca-normative-types:1.0.0-ALIEN20
18-
- org.ystia.common:2.2.0-SNAPSHOT
18+
- org.ystia.common:2.3.0-SNAPSHOT
1919

2020
node_types:
2121
org.ystia.consul.pub.nodes.ConsulUser:

org/ystia/dns/dnsmasq/ansible/types.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
88

99
metadata:
1010
template_name: org.ystia.dns.dnsmasq.ansible
11-
template_version: 2.2.0-SNAPSHOT
11+
template_version: 2.3.0-SNAPSHOT
1212
template_author: Ystia
1313

1414

1515
imports:
1616
- tosca-normative-types:1.0.0-ALIEN20
1717
- yorc-types:1.1.0
18-
- org.ystia.dns.pub:2.2.0-SNAPSHOT
18+
- org.ystia.dns.pub:2.3.0-SNAPSHOT
1919

2020
node_types:
2121
org.ystia.dns.dnsmasq.ansible.nodes.Dnsmasq:

org/ystia/dns/pub/types.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
88

99
metadata:
1010
template_name: org.ystia.dns.pub
11-
template_version: 2.2.0-SNAPSHOT
11+
template_version: 2.3.0-SNAPSHOT
1212
template_author: Ystia
1313

1414
description: Public interface types for DNS support.

org/ystia/dns/resolvconf/ansible/types.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
88

99
metadata:
1010
template_name: org.ystia.dns.resolvconf.ansible
11-
template_version: 2.2.0-SNAPSHOT
11+
template_version: 2.3.0-SNAPSHOT
1212
template_author: Ystia
1313

1414

1515
imports:
1616
- tosca-normative-types:1.0.0-ALIEN20
1717
- yorc-types:1.1.0
18-
- org.ystia.dns.pub:2.2.0-SNAPSHOT
18+
- org.ystia.dns.pub:2.3.0-SNAPSHOT
1919

2020
node_types:
2121
org.ystia.dns.resolvconf.ansible.Resolvconf:

org/ystia/docker/ansible/types.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ tosca_definitions_version: alien_dsl_2_0_0
88

99
metadata:
1010
template_name: org.ystia.docker.ansible
11-
template_version: 2.2.0-SNAPSHOT
11+
template_version: 2.3.0-SNAPSHOT
1212
template_author: Ystia
1313

1414
imports:
1515
- tosca-normative-types:1.0.0-ALIEN20
1616
- yorc-types:1.1.0
17-
- docker-types:2.2.0-SM10
17+
- docker-types:2.2.0
1818

1919
node_types:
2020
org.ystia.docker.ansible.nodes.Docker:

0 commit comments

Comments
 (0)