Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add YorcServer component #4

Merged
merged 69 commits into from
Sep 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
2a83166
import yorc types from a4c plugin
Jul 6, 2018
8645c16
add YorcPlugin node type to configure A4C
Jul 27, 2018
96040b9
fix upload plugin to a4c
Jul 27, 2018
8b479ed
update icon for YorcServer
Jul 27, 2018
ce3658b
fix pub component
Jul 27, 2018
6446996
fix missing directory
Jul 27, 2018
e07574b
fix working directory of running yorc service
Jul 30, 2018
2b6a0f7
Yorc server : download terraform bin
Jul 30, 2018
a1bf3a2
YorcServer : add proxies to service
Jul 31, 2018
8f25a2d
YorcServer : fix config dir hard coded
Jul 31, 2018
3306927
YorcServer : fix terraform version
Jul 31, 2018
31f99a7
YorcServer : add type to add OpenStack infrastructure in Yorc config …
Jul 31, 2018
49dcb32
YorcServer : use v3.0.0
Aug 6, 2018
ca2ca4a
OpenstackConfig : add key_pair artifact
Aug 6, 2018
17e7c21
OpenstackConfig : fix missing directory & variable
Aug 7, 2018
978a237
fix consul address & restart yorc after editing config & remove proxies
Aug 7, 2018
2876238
fix Yorc plugin configuration
Aug 9, 2018
b3a204c
use download_url property instead of artifact
Aug 9, 2018
b22c94c
enable configuration of Yorc http_port
Aug 9, 2018
85e5b75
add doc
Aug 10, 2018
3c475a5
fix default port of Yorc
Aug 10, 2018
b49510c
move terraform installation in a TerraformRuntime component
Aug 13, 2018
c3562f7
move http_port configuration
Aug 16, 2018
9f533eb
Add infrastructure configuration for AWS & kubernetes + use property …
Aug 16, 2018
9a22078
add missing newline
Aug 16, 2018
b5b470a
move ansible types from plugin
Aug 16, 2018
0135204
Add NFS components
Aug 17, 2018
4d0a4c4
add yorc_address_ha property
Aug 17, 2018
8364b47
use localhost ip for consul
Aug 17, 2018
3152b23
use hostname as server_id
Aug 17, 2018
3c9b10e
fix empty var
Aug 17, 2018
1d9363d
mount shared directory in mode 777
Aug 17, 2018
d03fbcf
fix NFS server permissions
Aug 20, 2018
b0bc8ec
use a4c 2.0.0 release
Aug 20, 2018
ae7acfb
NFSClient : derived from alien FileSystem
Aug 20, 2018
3499d6e
Add icon to terraform & ansible
Aug 20, 2018
5b80cd7
Remove runtime capability of Terraform & Ansible
Aug 21, 2018
01ddf07
Do not restart Yorc in configure state
Aug 21, 2018
395ddc5
Edit bad description
Aug 21, 2018
9d9e243
Fix doc
Aug 21, 2018
aac838d
YorcServer: rename filesystem_endpoint into work_directory
Aug 21, 2018
fac1733
Merge remote-tracking branch 'origin/develop' into feature/yorc-types
loicalbertin Aug 21, 2018
e4831d5
Update version numbers to be comform with the rest of the forge
loicalbertin Aug 21, 2018
e9d240a
Prevent permissions issues when configurating yorc
loicalbertin Aug 21, 2018
73b31f9
YorcServer: yorcConfig in 1 line
Aug 22, 2018
e6c3b6b
Consul: import plugin consul
Aug 22, 2018
a87d9b5
Add topologies for Yorc server
Aug 22, 2018
7725bf2
use community edition of a4c
Aug 22, 2018
ba29395
use community edition of a4c
Aug 22, 2018
5f9f83f
Ignore vscode conf files
loicalbertin Aug 23, 2018
544fa6f
add RuntimeDirectory for consul service to prevent error when folder …
Aug 23, 2018
5eac190
remove bad import
Aug 22, 2018
9eaeee7
add missing newline
Aug 27, 2018
e9a9144
use pub interfaces of a4c consul
Aug 22, 2018
76ae9b2
override default version of supported consul
Aug 23, 2018
48f4f2c
use port instead of api_port
Aug 23, 2018
4c747f7
fix property
Aug 23, 2018
37e9946
fix topologies
Aug 23, 2018
f31f3dc
Merge pull request #9 from ystia/feature/consul-a4c
BertrandD Aug 28, 2018
349c348
fix File exists on RuntimeDirectory
Aug 28, 2018
50e98db
reset env before curl local to avoid proxy
Aug 29, 2018
f206014
Deal with proxies when configuring Alien via its rest API
loicalbertin Aug 29, 2018
d13642f
make default_security_groups optional
Sep 4, 2018
446d525
Allow to create location in the Yorc orchestrator
Sep 5, 2018
3b137eb
fix topologies
Sep 5, 2018
01ff88c
move infrastructure config to post_configure on YorcServer workflow
Sep 5, 2018
367e19c
update topologies
Sep 5, 2018
8da5ec0
update documentation
Sep 6, 2018
9765a08
Merge remote-tracking branch 'origin/develop' into feature/yorc-types
loicalbertin Sep 6, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion org/ystia/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,24 @@ For the first method, see the example provided below for the *Welcome* sample.

For the second method:

- you need to configure a Git Location corresponding to the Ystia Forge in Alien4Cloud.
- you need to configure a Git Location corresponding to some Alien4Cloud components in the csar-public-library.

- Repository URL: https://github.com/alien4cloud/csar-public-library.git
- Credentials: *none*
- Branch: **v2.0.0**
- Archives to import:
loicalbertin marked this conversation as resolved.
Show resolved Hide resolved
- **org/alien4cloud/consul**
- **org/alien4cloud/java**
- **org/alien4cloud/elasticsearch**
- **org/alien4cloud/cloudify/manager/pub**
- **org/alien4cloud/cloudify/hostpool/pub**
- **org/alien4cloud/alien4cloud/pub**
- **org/alien4cloud/alien4cloud/config**
- **org/alien4cloud/alien4cloud/webapp**

- then execute the import operation for this git location. (known error : It is currently failing with the error : File path : archive.zip l:95 c: 70 The File does not respect YAML format, (mapping values are not allowed here).

- then you need to configure a Git Location corresponding to the Ystia Forge in Alien4Cloud.

- Repository URL: https://github.com/ystia/forge.git
- Credentials: *none*
Expand Down
20 changes: 20 additions & 0 deletions org/ystia/ansible/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.. _ansible_section:

*******
Ansible
*******

.. contents::
:local:
:depth: 3


AnsibleRuntime Component
------------------------

The AnsibleRuntime component install the ansible binary

Properties
^^^^^^^^^^

- **component_version**: Version of Ansible to install.
39 changes: 39 additions & 0 deletions org/ystia/ansible/linux/ansible/playbooks/create.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#
# Copyright 2018 Bull S.A.S. Atos Technologies - Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois, France.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

- name: Install Yorc
hosts: all
strategy: free
become: true
become_method: sudo
tasks:
- name: Load a variable file based on the OS type, or a default if not found. Using free-form to specify the file.
include_vars:
file: "{{ item }}"
with_first_found:
- "vars/{{ ansible_distribution }}.yml"
- "vars/{{ ansible_os_family }}.yml"

- name: install prerequirements
package:
name: "{{item}}"
state: present
with_items: "{{install_packages}}"

- name: install using pip
pip:
name: ansible
version: "{{ANSIBLE_VERSION}}"
39 changes: 39 additions & 0 deletions org/ystia/ansible/linux/ansible/playbooks/delete.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#
# Copyright 2018 Bull S.A.S. Atos Technologies - Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois, France.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

- name: Install Yorc
hosts: all
strategy: free
become: true
become_method: sudo
tasks:

- name: uninstall using pip
pip:
name: ansible
state: absent

- name: Load a variable file based on the OS type, or a default if not found. Using free-form to specify the file.
include_vars: "{{ item }}"
with_first_found:
- "{{ ansible_distribution }}.yml"
- "{{ ansible_os_family }}.yml"

- name: uninstall prerequirements
package:
name: "{{item}}"
state: absent
with_items: "{{install_packages}}"
23 changes: 23 additions & 0 deletions org/ystia/ansible/linux/ansible/playbooks/vars/Debian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
# Copyright 2018 Bull S.A.S. Atos Technologies - Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois, France.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

install_packages:
- gcc
- make
- python2
- python2-dev
- virtualenv
- python-pip
23 changes: 23 additions & 0 deletions org/ystia/ansible/linux/ansible/playbooks/vars/RedHat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
# Copyright 2018 Bull S.A.S. Atos Technologies - Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois, France.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

install_packages:
- gcc
- make
- python2
- python2-devel
- python-virtualenv
- python2-pip
37 changes: 37 additions & 0 deletions org/ystia/ansible/linux/ansible/types.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
tosca_definitions_version: alien_dsl_2_0_0
#
# Copyright 2018 Bull S.A.S. Atos Technologies - Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois, France.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

metadata:
template_name: org.ystia.ansible.linux.ansible
template_version: 2.1.0-SNAPSHOT
template_author: yorc

imports:
- tosca-normative-types:1.0.0-ALIEN20
- yorc-types:1.0.0
- org.ystia.ansible.pub:2.1.0-SNAPSHOT

node_types:
org.ystia.ansible.linux.ansible.nodes.AnsibleRuntime:
derived_from: org.ystia.ansible.pub.nodes.AnsibleRuntime
interfaces:
Standard:
create:
inputs:
ANSIBLE_VERSION: { get_property: [SELF, component_version] }
implementation: playbooks/create.yml
delete: playbooks/delete.yml
Binary file added org/ystia/ansible/pub/ansible.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions org/ystia/ansible/pub/types.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
tosca_definitions_version: alien_dsl_2_0_0
#
# Copyright 2018 Bull S.A.S. Atos Technologies - Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois, France.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

metadata:
template_name: org.ystia.ansible.pub
template_version: 2.1.0-SNAPSHOT
template_author: yorc

imports:
- tosca-normative-types:1.0.0-ALIEN20

node_types:
org.ystia.ansible.pub.nodes.AnsibleRuntime:
derived_from: tosca.nodes.SoftwareComponent
abstract: true
tags:
icon: ansible.png
properties:
component_version:
type: version
required: true
default: 2.4.1.0

relationship_types:
org.ystia.ansible.pub.relationships.DependsOnAnsibleRuntime:
derived_from: tosca.relationships.DependsOn
valid_target_types: [ org.ystia.ansible.pub.nodes.AnsibleRuntime ]
Loading