-
Notifications
You must be signed in to change notification settings - Fork 500
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Initial IBM InstructLab as a service code * Register mismatch for trusted profile, different lib version? * remove conditional code around Trusted Profiles * Clean up saml vars for Trusted Profile * Fix permissiions to write to CoS - isolate service instance * Updates to provision and adding in scaffolding deletion * Add destroyer capability to IBM Instructlab * none cloud_provider destroyer - debug task only * Clean up the destroy task names, registers etc
- Loading branch information
Showing
18 changed files
with
756 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- | ||
- name: Step 001.1 Destroy Infrastructure | ||
hosts: localhost | ||
connection: local | ||
gather_facts: false | ||
become: false | ||
tags: | ||
- step001 | ||
- step001.1 | ||
- deploy_infrastructure | ||
|
||
tasks: | ||
|
||
- name: Destroy none cloud_provider debug task | ||
ansible.builtin.debug: | ||
msg: Destroy none cloud_provider debug task |
3 changes: 3 additions & 0 deletions
3
ansible/collections/ansible_collections/agnosticd/ibm/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Ansible Collection - agnosticd.ibm | ||
|
||
Documentation for the collection. |
69 changes: 69 additions & 0 deletions
69
ansible/collections/ansible_collections/agnosticd/ibm/galaxy.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
### REQUIRED | ||
# The namespace of the collection. This can be a company/brand/organization or product namespace under which all | ||
# content lives. May only contain alphanumeric lowercase characters and underscores. Namespaces cannot start with | ||
# underscores or numbers and cannot contain consecutive underscores | ||
namespace: agnosticd | ||
|
||
# The name of the collection. Has the same character restrictions as 'namespace' | ||
name: ibm | ||
|
||
# The version of the collection. Must be compatible with semantic versioning | ||
version: 1.0.0 | ||
|
||
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection | ||
readme: README.md | ||
|
||
# A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url) | ||
# @nicks:irc/im.site#channel' | ||
authors: | ||
- your name <[email protected]> | ||
|
||
|
||
### OPTIONAL but strongly recommended | ||
# A short summary description of the collection | ||
description: your collection description | ||
|
||
# Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only | ||
# accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file' | ||
license: | ||
- GPL-2.0-or-later | ||
|
||
# The path to the license file for the collection. This path is relative to the root of the collection. This key is | ||
# mutually exclusive with 'license' | ||
license_file: '' | ||
|
||
# A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character | ||
# requirements as 'namespace' and 'name' | ||
tags: [] | ||
|
||
# Collections that this collection requires to be installed for it to be usable. The key of the dict is the | ||
# collection label 'namespace.name'. The value is a version range | ||
# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version | ||
# range specifiers can be set and are separated by ',' | ||
dependencies: {} | ||
|
||
# The URL of the originating SCM repository | ||
repository: http://example.com/repository | ||
|
||
# The URL to any online docs | ||
documentation: http://docs.example.com | ||
|
||
# The URL to the homepage of the collection/project | ||
homepage: http://example.com | ||
|
||
# The URL to the collection issue tracker | ||
issues: http://example.com/issue/tracker | ||
|
||
# A list of file glob-like patterns used to filter any files or directories that should not be included in the build | ||
# artifact. A pattern is matched from the relative path of the file or directory of the collection directory. This | ||
# uses 'fnmatch' to match the files or directories. Some directories and files like 'galaxy.yml', '*.pyc', '*.retry', | ||
# and '.git' are always filtered. Mutually exclusive with 'manifest' | ||
build_ignore: [] | ||
|
||
# A dict controlling use of manifest directives used in building the collection artifact. The key 'directives' is a | ||
# list of MANIFEST.in style | ||
# L(directives,https://packaging.python.org/en/latest/guides/using-manifest-in/#manifest-in-commands). The key | ||
# 'omit_default_directives' is a boolean that controls whether the default directives are used. Mutually exclusive | ||
# with 'build_ignore' | ||
# manifest: null | ||
|
52 changes: 52 additions & 0 deletions
52
ansible/collections/ansible_collections/agnosticd/ibm/meta/runtime.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
--- | ||
# Collections must specify a minimum required ansible version to upload | ||
# to galaxy | ||
# requires_ansible: '>=2.9.10' | ||
|
||
# Content that Ansible needs to load from another location or that has | ||
# been deprecated/removed | ||
# plugin_routing: | ||
# action: | ||
# redirected_plugin_name: | ||
# redirect: ns.col.new_location | ||
# deprecated_plugin_name: | ||
# deprecation: | ||
# removal_version: "4.0.0" | ||
# warning_text: | | ||
# See the porting guide on how to update your playbook to | ||
# use ns.col.another_plugin instead. | ||
# removed_plugin_name: | ||
# tombstone: | ||
# removal_version: "2.0.0" | ||
# warning_text: | | ||
# See the porting guide on how to update your playbook to | ||
# use ns.col.another_plugin instead. | ||
# become: | ||
# cache: | ||
# callback: | ||
# cliconf: | ||
# connection: | ||
# doc_fragments: | ||
# filter: | ||
# httpapi: | ||
# inventory: | ||
# lookup: | ||
# module_utils: | ||
# modules: | ||
# netconf: | ||
# shell: | ||
# strategy: | ||
# terminal: | ||
# test: | ||
# vars: | ||
|
||
# Python import statements that Ansible needs to load from another location | ||
# import_redirection: | ||
# ansible_collections.ns.col.plugins.module_utils.old_location: | ||
# redirect: ansible_collections.ns.col.plugins.module_utils.new_location | ||
|
||
# Groups of actions/modules that take a common set of options | ||
# action_groups: | ||
# group_name: | ||
# - module1 | ||
# - module2 |
11 changes: 11 additions & 0 deletions
11
ansible/collections/ansible_collections/agnosticd/ibm/playbooks/ibm_role_runner.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- | ||
- name: Run an IBM collection role standalone | ||
hosts: localhost | ||
gather_facts: true | ||
become: true | ||
|
||
tasks: | ||
|
||
- name: IBM Role Runner | ||
ansible.builtin.include_role: | ||
name: "{{ role }}" |
31 changes: 31 additions & 0 deletions
31
ansible/collections/ansible_collections/agnosticd/ibm/plugins/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# Collections Plugins Directory | ||
|
||
This directory can be used to ship various plugins inside an Ansible collection. Each plugin is placed in a folder that | ||
is named after the type of plugin it is in. It can also include the `module_utils` and `modules` directory that | ||
would contain module utils and modules respectively. | ||
|
||
Here is an example directory of the majority of plugins currently supported by Ansible: | ||
|
||
``` | ||
└── plugins | ||
├── action | ||
├── become | ||
├── cache | ||
├── callback | ||
├── cliconf | ||
├── connection | ||
├── filter | ||
├── httpapi | ||
├── inventory | ||
├── lookup | ||
├── module_utils | ||
├── modules | ||
├── netconf | ||
├── shell | ||
├── strategy | ||
├── terminal | ||
├── test | ||
└── vars | ||
``` | ||
|
||
A full list of plugin types can be found at [Working With Plugins](https://docs.ansible.com/ansible-core/2.15/plugins/plugins.html). |
38 changes: 38 additions & 0 deletions
38
...tions/ansible_collections/agnosticd/ibm/roles/ibm_instructlab_service/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
Role Name | ||
========= | ||
|
||
A brief description of the role goes here. | ||
|
||
Requirements | ||
------------ | ||
|
||
Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. | ||
|
||
Role Variables | ||
-------------- | ||
|
||
A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. | ||
|
||
Dependencies | ||
------------ | ||
|
||
A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. | ||
|
||
Example Playbook | ||
---------------- | ||
|
||
Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: | ||
|
||
- hosts: servers | ||
roles: | ||
- { role: username.rolename, x: 42 } | ||
|
||
License | ||
------- | ||
|
||
BSD | ||
|
||
Author Information | ||
------------------ | ||
|
||
An optional section for the role authors to include contact information, or a website (HTML is not allowed). |
31 changes: 31 additions & 0 deletions
31
...ections/ansible_collections/agnosticd/ibm/roles/ibm_instructlab_service/defaults/main.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
--- | ||
|
||
# ibm_cloud_scenario: scenario_ibm_instructlab_service | ||
|
||
# ibm_cloud_scenario: false | ||
|
||
# email: "[email protected]" | ||
|
||
# ibm_deploy_with_ansible: true | ||
# ibm_resource_prefix: "ibm_{{ guid }}" | ||
# ibm_name_prefix: "ibm-{{ guid }}" | ||
|
||
# ibm_resource_group_name: "{{ guid }}-resource-group" | ||
# ibm_access_group_name: "{{ guid }}-access-group" | ||
# ibm_trusted_profile_name: "{{ guid }}-trusted-profile" | ||
# ibm_cos_instance_name: "{{ guid }}-cos-instance" | ||
# bucket_name: "{{ guid }}-unique-bucket-name" | ||
|
||
# # ibm_realm_name: "iamasecret" | ||
# ibm_region_location: "us-south" | ||
# ibm_storage_class: standard | ||
|
||
|
||
# # Terraform vars - this is experimental and not recommended for production use | ||
|
||
# ibm_deploy_with_terraform: false | ||
# ibm_terraform_dir: "{{ output_dir }}" | ||
|
||
# ibm_terraform_version: "1.51.0" | ||
# ibm_terraform_resource_prefix: "ibm_{{ guid }}" | ||
# ibm_terraform_name_prefix: "ibm-{{ guid }}" |
2 changes: 2 additions & 0 deletions
2
...ections/ansible_collections/agnosticd/ibm/roles/ibm_instructlab_service/handlers/main.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
--- | ||
# handlers file for ibm_instructlab_service |
52 changes: 52 additions & 0 deletions
52
...collections/ansible_collections/agnosticd/ibm/roles/ibm_instructlab_service/meta/main.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
galaxy_info: | ||
author: your name | ||
description: your role description | ||
company: your company (optional) | ||
|
||
# If the issue tracker for your role is not on github, uncomment the | ||
# next line and provide a value | ||
# issue_tracker_url: http://example.com/issue/tracker | ||
|
||
# Choose a valid license ID from https://spdx.org - some suggested licenses: | ||
# - BSD-3-Clause (default) | ||
# - MIT | ||
# - GPL-2.0-or-later | ||
# - GPL-3.0-only | ||
# - Apache-2.0 | ||
# - CC-BY-4.0 | ||
license: license (GPL-2.0-or-later, MIT, etc) | ||
|
||
min_ansible_version: 2.1 | ||
|
||
# If this a Container Enabled role, provide the minimum Ansible Container version. | ||
# min_ansible_container_version: | ||
|
||
# | ||
# Provide a list of supported platforms, and for each platform a list of versions. | ||
# If you don't wish to enumerate all versions for a particular platform, use 'all'. | ||
# To view available platforms and versions (or releases), visit: | ||
# https://galaxy.ansible.com/api/v1/platforms/ | ||
# | ||
# platforms: | ||
# - name: Fedora | ||
# versions: | ||
# - all | ||
# - 25 | ||
# - name: SomePlatform | ||
# versions: | ||
# - all | ||
# - 1.0 | ||
# - 7 | ||
# - 99.99 | ||
|
||
galaxy_tags: [] | ||
# List tags for your role here, one per line. A tag is a keyword that describes | ||
# and categorizes the role. Users find roles by searching for tags. Be sure to | ||
# remove the '[]' above, if you add tags to this list. | ||
# | ||
# NOTE: A tag is limited to a single word comprised of alphanumeric characters. | ||
# Maximum 20 tags per role. | ||
|
||
dependencies: [] | ||
# List your role dependencies here, one per line. Be sure to remove the '[]' above, | ||
# if you add dependencies to this list. |
68 changes: 68 additions & 0 deletions
68
...ollections/ansible_collections/agnosticd/ibm/roles/ibm_instructlab_service/tasks/main.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
--- | ||
|
||
- name: Deploy IBM infrastructure via Ansible and IBM CloudCollection | ||
when: > | ||
(ACTION == "create" or ACTION == "provision") | ||
and ibm_deploy_with_ansible | default(true) | bool | ||
block: | ||
|
||
- name: Include the scenario tasks to deploy the IBM infrastructure | ||
ansible.builtin.include_tasks: | ||
file: scenarios/ibm_instructlab_service_provision.yml | ||
|
||
become: false | ||
connection: local | ||
|
||
- name: Delete IBM infrastructure via Ansible and IBM CloudCollection | ||
when: > | ||
ACTION == "destroy" | ||
and ibm_deploy_with_ansible | default(true) | bool | ||
block: | ||
|
||
- name: Include the scenario tasks to deploy the IBM infrastructure | ||
ansible.builtin.include_tasks: | ||
file: scenarios/ibm_instructlab_service_destroy.yml | ||
|
||
become: false | ||
connection: local | ||
|
||
- name: Deploy IBM infrastructure via Terraform | ||
when: > | ||
(ACTION == "create" or ACTION == "provision") | ||
and ibm_deploy_with_terraform | default(false) | bool | ||
block: | ||
|
||
- name: Generate IBM Terrafrom instructlab-as-a-service Template | ||
ansible.builtin.template: | ||
src: instructlab-as-a-service.j2 | ||
dest: "{{ output_dir }}/main.tf" # "~/tmp/main.tf" | ||
# become: false | ||
# connection: local | ||
|
||
- name: Run Terraform | ||
community.general.terraform: | ||
project_path: "{{ output_dir }}" # "~/tmp" | ||
state: "{{ ibm_terraform_state | default('present') }}" | ||
# force_init: true | ||
# variables: "{{ ibm_terraform_variables | default(omit) | ||
register: r_terraform_output | ||
|
||
become: false | ||
connection: local | ||
|
||
# | ||
#- name: Provision tasks | ||
# when: TRACTION == "create" or ACTION == "provision" | ||
# block: | ||
# | ||
# - name: Load and defined scenarios if required | ||
# when: | ||
# - ibm_cloud_scenario is true | ||
# - ibm_cloud_scenarios is defined | ||
# - ibm_cloud_scenarios | length > 0 | ||
# ansible.builtin.include_tasks: | ||
# file: "scenarios/{{ scenario }}.yml" | ||
# loop: "{{ ibm_cloud_scenarios }}" | ||
# loop_control: | ||
# loop_var: scenario | ||
# |
Oops, something went wrong.