Skip to content

Commit 1551a3d

Browse files
authored
Merge pull request #290 from winem/remove-ewc-migrate-rbac-ldap
Remove EWC support & move LDAP/RBAC configuration to Stackstorm.st2
2 parents 5f1a63c + 0ed1247 commit 1551a3d

File tree

37 files changed

+249
-721
lines changed

37 files changed

+249
-721
lines changed

.kitchen.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ provisioner:
1616
idempotency_test: true
1717
extra_vars:
1818
st2repo_name: <%= ENV['ST2_REPO'] || 'stable' %>
19-
ewc_repo: <%= ENV['EWC_REPO'] || 'enterprise' %>
20-
ewc_license: "<%= ENV['LICENSE'] ? ENV[ENV['LICENSE']] : ENV['BWC_LICENSE_ENTERPRISE'] %>"
2119
st2chatops_hubot_adapter: slack
2220
st2chatops_config:
2321
HUBOT_SLACK_TOKEN: <%= ENV['HUBOT_SLACK_TOKEN'] %>
22+
st2_rbac_enable: yes
2423

2524
platforms:
2625
# Ubuntu Xenial with Systemd

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ branches:
99

1010
env:
1111
# default is stable repo
12-
- DISTRO=ubuntu-16 LICENSE='BWC_LICENSE_ENTERPRISE'
13-
- DISTRO=ubuntu-18 LICENSE='BWC_LICENSE_ENTERPRISE'
14-
- DISTRO=centos-7 LICENSE='BWC_LICENSE_ENTERPRISE'
15-
- DISTRO=centos-8 LICENSE='BWC_LICENSE_ENTERPRISE'
12+
- DISTRO=ubuntu-16
13+
- DISTRO=ubuntu-18
14+
- DISTRO=centos-7
15+
- DISTRO=centos-8
1616

1717
# StackStorm 'unstable' repo check
18-
- DISTRO=ubuntu-16 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
19-
- DISTRO=ubuntu-18 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
20-
- DISTRO=centos-7 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
21-
- DISTRO=centos-8 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
18+
- DISTRO=ubuntu-16 ST2_REPO=unstable
19+
- DISTRO=ubuntu-18 ST2_REPO=unstable
20+
- DISTRO=centos-7 ST2_REPO=unstable
21+
- DISTRO=centos-8 ST2_REPO=unstable
2222

2323
before_script:
2424
# Personal token for forked PRs

README.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ Below is the list of variables you can redefine in your playbook to customize st
4444
| `st2_auth_username` | `testu` | Username used by StackStorm standalone authentication.
4545
| `st2_auth_password` | `testp` | Password used by StackStorm standalone authentication.
4646
| `st2_save_credentials` | `yes` | Save credentials for local CLI in `/root/.st2/config` file.
47+
| `st2_rbac_enable` | `no` | Enable RBAC. |
48+
| `st2_rbac` | [See `st2_rbac` variable in role defaults](roles/st2/defaults/main.yml) | RBAC roles and assignments. This is a dictionary with two keys `roles` and `assignments`. `roles` and `assignments` are in turn both arrays. Each element in the array follows the exact YAML schema for [roles](https://docs.stackstorm.com/rbac.html#user-permissions) and [assignments](https://docs.stackstorm.com/rbac.html#defining-user-role-assignments) defined in ST2 documentation.
49+
| `st2_ldap_enable` | `no` | Enable LDAP authentication backend. |
50+
| `st2_ldap` | [See `st2_ldap` variable in role defaults](roles/st2/defaults/main.yml) | Settings for LDAP authentication backend. `st2_ldap` is a dictionary and has one item `backend_kwargs`. `backend_kwargs` should be provided as exactly listed in ST2 documentation for [LDAP configuration](https://docs.stackstorm.com/authentication.html#ldap).
4751
| `st2_packs` | `[ st2 ]` | List of packs to install. This flag does not work with a `--python3` only pack.
4852
| `st2_python_packages` | `[ ]` | List of python packages to install into the `/opt/stackstorm/st2` virtualenv. This is needed when deploying alternative auth or coordination backends which depend on Python modules to make them work.
4953
| `st2_u16_add_insecure_py3_ppa` | `false` | Whether permission is granted to install the deadsnakes Python3.6 PPA for Ubuntu 16.
@@ -52,13 +56,6 @@ Below is the list of variables you can redefine in your playbook to customize st
5256
| `st2web_ssl_certificate` | `null` | String with custom SSL certificate (`.crt`). If not provided, self-signed certificate will be generated.
5357
| `st2web_ssl_certificate_key` | `null` | String with custom SSL certificate secret key (`.key`). If not provided, self-signed certificate will be generated.
5458
| `st2web_nginx_config` | `null` | String with a custom nginx configuration file (`st2.conf`). If not provided, the default st2.conf will be used.
55-
| **ewc**
56-
| `ewc_license` | `null` | EWC license key is required for installing EWC enteprise bits via this ansible role.
57-
| `ewc_repo` | `enterprise` | EWC PackageCloud repository to install. [`enterprise`](https://packagecloud.io/StackStorm/enterprise/), [`enterprise-unstable`](https://packagecloud.io/StackStorm/enterprise-unstable/), [`staging-enterprise`](https://packagecloud.io/StackStorm/staging-enteprise/), [`staging-enterprise-unstable`](https://packagecloud.io/StackStorm/staging-enterprise-unstable/)
58-
| `ewc_version` | `latest` | EWC enterprise version to install. `present` to install available package, `latest` to get automatic updates, or pin it to numeric version like `2.2.0`. The version used here should match `st2_version`.
59-
| `ewc_revision` | `1` | EWC enterprise revision to install. Used only with pinned `ewc_version`.
60-
| `ewc_rbac` | [See `ewc_rbac` variable in role defaults](roles/StackStorm.ewc/defaults/main.yml) | EWC RBAC roles and assignments. This is a dictionary with two keys `roles` and `assignments`. `roles` and `assignments` are in turn both arrays. Each element in the array follows the exact YAML schema for [roles](https://ewc-docs.extremenetworks.com/rbac.html#user-permissions) and [assignments](https://ewc-docs.extremenetworks.com/rbac.html#defining-user-role-assignments) defined in EWC documentation.
61-
| `ewc_ldap` | [See `ewc_ldap` variable in role defaults](roles/StackStorm.ewc/defaults/main.yml) | Settings for EWC LDAP authentication backend. `ewc_ldap` is a dictionary and has one item `backend_kwargs`. `backend_kwargs` should be provided as exactly listed in EWC documentation for [LDAP configuration](https://ewc-docs.extremenetworks.com/authentication.html#auth-backends).
6259
| **st2chatops**
6360
| `st2chatops_version` | `latest` | st2chatops version to install. `present` to install available package, `latest` to get automatic updates, or pin it to numeric version like `2.2.0` or with revision like `2.2.0-1`.
6461
| `st2chatops_st2_api_key` | | st2 API key to be updated in st2chatops.env using "st2 apikey create -k" in a task

meta/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# roles_path = /etc/ansible/roles/:/etc/ansible/roles/StackStorm.stackstorm/roles/
99
---
1010
galaxy_info:
11-
description: Install StackStorm (IFTTT for Ops) with all the components like Web UI, ChatOps, EWC and dependant services including RabbitMQ, MongoDB, nginx.
11+
description: Install StackStorm (IFTTT for Ops) with all the components like Web UI, ChatOps and dependant services including RabbitMQ, MongoDB, nginx.
1212
author: armab
1313
company: StackStorm
1414
license: Apache 2.0
@@ -34,8 +34,6 @@ galaxy_info:
3434
- st2
3535
- st2web
3636
- st2chatops
37-
- bwc
38-
- ewc
3937
- rabbitmq
4038
- mongodb
4139
- nginx

roles/StackStorm.ewc/defaults/main.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

roles/StackStorm.ewc/handlers/main.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

roles/StackStorm.ewc/meta/main.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

roles/StackStorm.ewc/tasks/ewc_repos_cleanup_debian.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

roles/StackStorm.ewc/tasks/ewc_repos_cleanup_redhat.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

roles/StackStorm.ewc/tasks/ewc_repos_debian.yml

Lines changed: 0 additions & 93 deletions
This file was deleted.

0 commit comments

Comments
 (0)