From 52ed353c8554b5819f7d587fd32858f348c6aec2 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Tue, 29 Jan 2019 14:42:28 -0600 Subject: [PATCH 1/3] Prefix roles with StackStorm galaxy org Part of #12 and #45 --- README.md | 4 +-- roles/{epel => StackStorm.epel}/meta/main.yml | 0 .../{epel => StackStorm.epel}/tasks/main.yml | 0 .../{ewc => StackStorm.ewc}/defaults/main.yml | 0 .../{ewc => StackStorm.ewc}/handlers/main.yml | 0 roles/{ewc => StackStorm.ewc}/meta/main.yml | 0 .../tasks/ewc_repos_apt.yml | 0 .../tasks/ewc_repos_cleanup_apt.yml | 0 .../tasks/ewc_repos_cleanup_yum.yml | 0 .../tasks/ewc_repos_setup.yml | 0 .../tasks/ewc_repos_yum.yml | 0 roles/{ewc => StackStorm.ewc}/tasks/ldap.yml | 0 .../{ewc => StackStorm.ewc}/tasks/license.yml | 0 roles/{ewc => StackStorm.ewc}/tasks/main.yml | 0 roles/{ewc => StackStorm.ewc}/tasks/rbac.yml | 0 .../rbac_assignments/assignments.yml.j2 | 0 .../templates/rbac_roles/roles.yml.j2 | 0 .../vars/enterprise-unstable.yml | 0 .../vars/enterprise.yml | 0 .../vars/staging-enterprise-unstable.yml | 0 .../vars/staging-enterprise.yml | 0 .../defaults/main.yml | 0 .../meta/main.yml | 0 .../tasks/main.yml | 0 .../tasks/teardown.yml | 0 .../rbac_assignments/assignments.yml.j2 | 0 .../templates/rbac_roles/roles.yml.j2 | 0 .../defaults/main.yml | 0 .../handlers/main.yml | 0 .../meta/main.yml | 2 +- .../tasks/main.yml | 0 .../tasks/mongodb_apt.yml | 0 .../tasks/mongodb_auth.yml | 0 .../tasks/mongodb_yum.yml | 0 .../vars/main.yml | 0 .../handlers/main.yml | 0 .../{nginx => StackStorm.nginx}/meta/main.yml | 0 .../tasks/main.yml | 0 .../tasks/nginx_apt.yml | 0 .../tasks/nginx_yum.yml | 0 .../defaults/main.yml | 0 .../meta/main.yml | 0 .../tasks/main.yml | 0 .../tasks/nodejs_apt.yml | 0 .../tasks/nodejs_yum.yml | 0 .../meta/main.yml | 0 .../tasks/main.yml | 0 .../tasks/postgresql_apt.yml | 0 .../tasks/postgresql_yum6.yml | 0 .../tasks/postgresql_yum7.yml | 0 .../defaults/main.yml | 0 .../handlers/main.yml | 0 .../meta/main.yml | 0 .../tasks/main.yml | 0 .../vars/main.yml | 0 .../{st2 => StackStorm.st2}/defaults/main.yml | 0 .../{st2 => StackStorm.st2}/handlers/main.yml | 0 roles/{st2 => StackStorm.st2}/meta/main.yml | 4 +-- roles/{st2 => StackStorm.st2}/tasks/auth.yml | 0 .../{st2 => StackStorm.st2}/tasks/config.yml | 0 .../tasks/datastore.yml | 0 roles/{st2 => StackStorm.st2}/tasks/main.yml | 0 roles/{st2 => StackStorm.st2}/tasks/proxy.yml | 0 roles/{st2 => StackStorm.st2}/tasks/user.yml | 0 .../{st2 => StackStorm.st2}/tasks/version.yml | 0 roles/{st2 => StackStorm.st2}/vars/main.yml | 0 .../defaults/main.yml | 0 .../handlers/main.yml | 0 .../meta/main.yml | 4 +-- .../tasks/main.yml | 0 .../vars/main.yml | 0 .../defaults/main.yml | 0 .../handlers/main.yml | 0 .../meta/main.yml | 4 +-- .../tasks/config.yml | 0 .../tasks/main.yml | 0 .../templates/init_mistral_db.SQL.j2 | 0 .../vars/main.yml | 0 .../defaults/main.yml | 0 .../meta/main.yml | 0 .../tasks/main.yml | 0 .../tasks/st2repo_apt.yml | 0 .../tasks/st2repo_yum.yml | 0 .../vars/stable.yml | 0 .../vars/staging-stable.yml | 0 .../vars/staging-unstable.yml | 0 .../vars/unstable.yml | 0 .../tasks/main.yml | 0 .../tasks/st2chatops.yml | 0 .../defaults/main.yml | 0 .../meta/main.yml | 6 ++--- .../tasks/certificate.yml | 0 .../tasks/main.yml | 0 .../vars/main.yml | 0 stackstorm.yml | 26 +++++++++---------- 95 files changed, 25 insertions(+), 25 deletions(-) rename roles/{epel => StackStorm.epel}/meta/main.yml (100%) rename roles/{epel => StackStorm.epel}/tasks/main.yml (100%) rename roles/{ewc => StackStorm.ewc}/defaults/main.yml (100%) rename roles/{ewc => StackStorm.ewc}/handlers/main.yml (100%) rename roles/{ewc => StackStorm.ewc}/meta/main.yml (100%) rename roles/{ewc => StackStorm.ewc}/tasks/ewc_repos_apt.yml (100%) rename roles/{ewc => StackStorm.ewc}/tasks/ewc_repos_cleanup_apt.yml (100%) rename roles/{ewc => StackStorm.ewc}/tasks/ewc_repos_cleanup_yum.yml (100%) rename roles/{ewc => StackStorm.ewc}/tasks/ewc_repos_setup.yml (100%) rename roles/{ewc => StackStorm.ewc}/tasks/ewc_repos_yum.yml (100%) rename roles/{ewc => StackStorm.ewc}/tasks/ldap.yml (100%) rename roles/{ewc => StackStorm.ewc}/tasks/license.yml (100%) rename roles/{ewc => StackStorm.ewc}/tasks/main.yml (100%) rename roles/{ewc => StackStorm.ewc}/tasks/rbac.yml (100%) rename roles/{ewc => StackStorm.ewc}/templates/rbac_assignments/assignments.yml.j2 (100%) rename roles/{ewc => StackStorm.ewc}/templates/rbac_roles/roles.yml.j2 (100%) rename roles/{ewc => StackStorm.ewc}/vars/enterprise-unstable.yml (100%) rename roles/{ewc => StackStorm.ewc}/vars/enterprise.yml (100%) rename roles/{ewc => StackStorm.ewc}/vars/staging-enterprise-unstable.yml (100%) rename roles/{ewc => StackStorm.ewc}/vars/staging-enterprise.yml (100%) rename roles/{ewc_smoketests => StackStorm.ewc_smoketests}/defaults/main.yml (100%) rename roles/{ewc_smoketests => StackStorm.ewc_smoketests}/meta/main.yml (100%) rename roles/{ewc_smoketests => StackStorm.ewc_smoketests}/tasks/main.yml (100%) rename roles/{ewc_smoketests => StackStorm.ewc_smoketests}/tasks/teardown.yml (100%) rename roles/{ewc_smoketests => StackStorm.ewc_smoketests}/templates/rbac_assignments/assignments.yml.j2 (100%) rename roles/{ewc_smoketests => StackStorm.ewc_smoketests}/templates/rbac_roles/roles.yml.j2 (100%) rename roles/{mongodb => StackStorm.mongodb}/defaults/main.yml (100%) rename roles/{mongodb => StackStorm.mongodb}/handlers/main.yml (100%) rename roles/{mongodb => StackStorm.mongodb}/meta/main.yml (93%) rename roles/{mongodb => StackStorm.mongodb}/tasks/main.yml (100%) rename roles/{mongodb => StackStorm.mongodb}/tasks/mongodb_apt.yml (100%) rename roles/{mongodb => StackStorm.mongodb}/tasks/mongodb_auth.yml (100%) rename roles/{mongodb => StackStorm.mongodb}/tasks/mongodb_yum.yml (100%) rename roles/{mongodb => StackStorm.mongodb}/vars/main.yml (100%) rename roles/{nginx => StackStorm.nginx}/handlers/main.yml (100%) rename roles/{nginx => StackStorm.nginx}/meta/main.yml (100%) rename roles/{nginx => StackStorm.nginx}/tasks/main.yml (100%) rename roles/{nginx => StackStorm.nginx}/tasks/nginx_apt.yml (100%) rename roles/{nginx => StackStorm.nginx}/tasks/nginx_yum.yml (100%) rename roles/{nodejs => StackStorm.nodejs}/defaults/main.yml (100%) rename roles/{nodejs => StackStorm.nodejs}/meta/main.yml (100%) rename roles/{nodejs => StackStorm.nodejs}/tasks/main.yml (100%) rename roles/{nodejs => StackStorm.nodejs}/tasks/nodejs_apt.yml (100%) rename roles/{nodejs => StackStorm.nodejs}/tasks/nodejs_yum.yml (100%) rename roles/{postgresql => StackStorm.postgresql}/meta/main.yml (100%) rename roles/{postgresql => StackStorm.postgresql}/tasks/main.yml (100%) rename roles/{postgresql => StackStorm.postgresql}/tasks/postgresql_apt.yml (100%) rename roles/{postgresql => StackStorm.postgresql}/tasks/postgresql_yum6.yml (100%) rename roles/{postgresql => StackStorm.postgresql}/tasks/postgresql_yum7.yml (100%) rename roles/{rabbitmq => StackStorm.rabbitmq}/defaults/main.yml (100%) rename roles/{rabbitmq => StackStorm.rabbitmq}/handlers/main.yml (100%) rename roles/{rabbitmq => StackStorm.rabbitmq}/meta/main.yml (100%) rename roles/{rabbitmq => StackStorm.rabbitmq}/tasks/main.yml (100%) rename roles/{rabbitmq => StackStorm.rabbitmq}/vars/main.yml (100%) rename roles/{st2 => StackStorm.st2}/defaults/main.yml (100%) rename roles/{st2 => StackStorm.st2}/handlers/main.yml (100%) rename roles/{st2 => StackStorm.st2}/meta/main.yml (89%) rename roles/{st2 => StackStorm.st2}/tasks/auth.yml (100%) rename roles/{st2 => StackStorm.st2}/tasks/config.yml (100%) rename roles/{st2 => StackStorm.st2}/tasks/datastore.yml (100%) rename roles/{st2 => StackStorm.st2}/tasks/main.yml (100%) rename roles/{st2 => StackStorm.st2}/tasks/proxy.yml (100%) rename roles/{st2 => StackStorm.st2}/tasks/user.yml (100%) rename roles/{st2 => StackStorm.st2}/tasks/version.yml (100%) rename roles/{st2 => StackStorm.st2}/vars/main.yml (100%) rename roles/{st2chatops => StackStorm.st2chatops}/defaults/main.yml (100%) rename roles/{st2chatops => StackStorm.st2chatops}/handlers/main.yml (100%) rename roles/{st2chatops => StackStorm.st2chatops}/meta/main.yml (87%) rename roles/{st2chatops => StackStorm.st2chatops}/tasks/main.yml (100%) rename roles/{st2chatops => StackStorm.st2chatops}/vars/main.yml (100%) rename roles/{st2mistral => StackStorm.st2mistral}/defaults/main.yml (100%) rename roles/{st2mistral => StackStorm.st2mistral}/handlers/main.yml (100%) rename roles/{st2mistral => StackStorm.st2mistral}/meta/main.yml (87%) rename roles/{st2mistral => StackStorm.st2mistral}/tasks/config.yml (100%) rename roles/{st2mistral => StackStorm.st2mistral}/tasks/main.yml (100%) rename roles/{st2mistral => StackStorm.st2mistral}/templates/init_mistral_db.SQL.j2 (100%) rename roles/{st2mistral => StackStorm.st2mistral}/vars/main.yml (100%) rename roles/{st2repo => StackStorm.st2repo}/defaults/main.yml (100%) rename roles/{st2repo => StackStorm.st2repo}/meta/main.yml (100%) rename roles/{st2repo => StackStorm.st2repo}/tasks/main.yml (100%) rename roles/{st2repo => StackStorm.st2repo}/tasks/st2repo_apt.yml (100%) rename roles/{st2repo => StackStorm.st2repo}/tasks/st2repo_yum.yml (100%) rename roles/{st2repo => StackStorm.st2repo}/vars/stable.yml (100%) rename roles/{st2repo => StackStorm.st2repo}/vars/staging-stable.yml (100%) rename roles/{st2repo => StackStorm.st2repo}/vars/staging-unstable.yml (100%) rename roles/{st2repo => StackStorm.st2repo}/vars/unstable.yml (100%) rename roles/{st2smoketests => StackStorm.st2smoketests}/tasks/main.yml (100%) rename roles/{st2smoketests => StackStorm.st2smoketests}/tasks/st2chatops.yml (100%) rename roles/{st2web => StackStorm.st2web}/defaults/main.yml (100%) rename roles/{st2web => StackStorm.st2web}/meta/main.yml (80%) rename roles/{st2web => StackStorm.st2web}/tasks/certificate.yml (100%) rename roles/{st2web => StackStorm.st2web}/tasks/main.yml (100%) rename roles/{st2web => StackStorm.st2web}/vars/main.yml (100%) diff --git a/README.md b/README.md index 7e6af291..3ba5a6cd 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,8 @@ Below is the list of variables you can redefine in your playbook to customize st | `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/) | `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`. | `ewc_revision` | `1` | EWC enterprise revision to install. Used only with pinned `ewc_version`. -| `ewc_rbac` | [See `ewc_rbac` variable in role defaults](roles/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. -| `ewc_ldap` | [See `ewc_ldap` variable in role defaults](roles/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). +| `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. +| `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). | **st2chatops** | `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`. | `st2chatops_st2_api_key` | | st2 API key to be updated in st2chatops.env using "st2 apikey create -k" in a task diff --git a/roles/epel/meta/main.yml b/roles/StackStorm.epel/meta/main.yml similarity index 100% rename from roles/epel/meta/main.yml rename to roles/StackStorm.epel/meta/main.yml diff --git a/roles/epel/tasks/main.yml b/roles/StackStorm.epel/tasks/main.yml similarity index 100% rename from roles/epel/tasks/main.yml rename to roles/StackStorm.epel/tasks/main.yml diff --git a/roles/ewc/defaults/main.yml b/roles/StackStorm.ewc/defaults/main.yml similarity index 100% rename from roles/ewc/defaults/main.yml rename to roles/StackStorm.ewc/defaults/main.yml diff --git a/roles/ewc/handlers/main.yml b/roles/StackStorm.ewc/handlers/main.yml similarity index 100% rename from roles/ewc/handlers/main.yml rename to roles/StackStorm.ewc/handlers/main.yml diff --git a/roles/ewc/meta/main.yml b/roles/StackStorm.ewc/meta/main.yml similarity index 100% rename from roles/ewc/meta/main.yml rename to roles/StackStorm.ewc/meta/main.yml diff --git a/roles/ewc/tasks/ewc_repos_apt.yml b/roles/StackStorm.ewc/tasks/ewc_repos_apt.yml similarity index 100% rename from roles/ewc/tasks/ewc_repos_apt.yml rename to roles/StackStorm.ewc/tasks/ewc_repos_apt.yml diff --git a/roles/ewc/tasks/ewc_repos_cleanup_apt.yml b/roles/StackStorm.ewc/tasks/ewc_repos_cleanup_apt.yml similarity index 100% rename from roles/ewc/tasks/ewc_repos_cleanup_apt.yml rename to roles/StackStorm.ewc/tasks/ewc_repos_cleanup_apt.yml diff --git a/roles/ewc/tasks/ewc_repos_cleanup_yum.yml b/roles/StackStorm.ewc/tasks/ewc_repos_cleanup_yum.yml similarity index 100% rename from roles/ewc/tasks/ewc_repos_cleanup_yum.yml rename to roles/StackStorm.ewc/tasks/ewc_repos_cleanup_yum.yml diff --git a/roles/ewc/tasks/ewc_repos_setup.yml b/roles/StackStorm.ewc/tasks/ewc_repos_setup.yml similarity index 100% rename from roles/ewc/tasks/ewc_repos_setup.yml rename to roles/StackStorm.ewc/tasks/ewc_repos_setup.yml diff --git a/roles/ewc/tasks/ewc_repos_yum.yml b/roles/StackStorm.ewc/tasks/ewc_repos_yum.yml similarity index 100% rename from roles/ewc/tasks/ewc_repos_yum.yml rename to roles/StackStorm.ewc/tasks/ewc_repos_yum.yml diff --git a/roles/ewc/tasks/ldap.yml b/roles/StackStorm.ewc/tasks/ldap.yml similarity index 100% rename from roles/ewc/tasks/ldap.yml rename to roles/StackStorm.ewc/tasks/ldap.yml diff --git a/roles/ewc/tasks/license.yml b/roles/StackStorm.ewc/tasks/license.yml similarity index 100% rename from roles/ewc/tasks/license.yml rename to roles/StackStorm.ewc/tasks/license.yml diff --git a/roles/ewc/tasks/main.yml b/roles/StackStorm.ewc/tasks/main.yml similarity index 100% rename from roles/ewc/tasks/main.yml rename to roles/StackStorm.ewc/tasks/main.yml diff --git a/roles/ewc/tasks/rbac.yml b/roles/StackStorm.ewc/tasks/rbac.yml similarity index 100% rename from roles/ewc/tasks/rbac.yml rename to roles/StackStorm.ewc/tasks/rbac.yml diff --git a/roles/ewc/templates/rbac_assignments/assignments.yml.j2 b/roles/StackStorm.ewc/templates/rbac_assignments/assignments.yml.j2 similarity index 100% rename from roles/ewc/templates/rbac_assignments/assignments.yml.j2 rename to roles/StackStorm.ewc/templates/rbac_assignments/assignments.yml.j2 diff --git a/roles/ewc/templates/rbac_roles/roles.yml.j2 b/roles/StackStorm.ewc/templates/rbac_roles/roles.yml.j2 similarity index 100% rename from roles/ewc/templates/rbac_roles/roles.yml.j2 rename to roles/StackStorm.ewc/templates/rbac_roles/roles.yml.j2 diff --git a/roles/ewc/vars/enterprise-unstable.yml b/roles/StackStorm.ewc/vars/enterprise-unstable.yml similarity index 100% rename from roles/ewc/vars/enterprise-unstable.yml rename to roles/StackStorm.ewc/vars/enterprise-unstable.yml diff --git a/roles/ewc/vars/enterprise.yml b/roles/StackStorm.ewc/vars/enterprise.yml similarity index 100% rename from roles/ewc/vars/enterprise.yml rename to roles/StackStorm.ewc/vars/enterprise.yml diff --git a/roles/ewc/vars/staging-enterprise-unstable.yml b/roles/StackStorm.ewc/vars/staging-enterprise-unstable.yml similarity index 100% rename from roles/ewc/vars/staging-enterprise-unstable.yml rename to roles/StackStorm.ewc/vars/staging-enterprise-unstable.yml diff --git a/roles/ewc/vars/staging-enterprise.yml b/roles/StackStorm.ewc/vars/staging-enterprise.yml similarity index 100% rename from roles/ewc/vars/staging-enterprise.yml rename to roles/StackStorm.ewc/vars/staging-enterprise.yml diff --git a/roles/ewc_smoketests/defaults/main.yml b/roles/StackStorm.ewc_smoketests/defaults/main.yml similarity index 100% rename from roles/ewc_smoketests/defaults/main.yml rename to roles/StackStorm.ewc_smoketests/defaults/main.yml diff --git a/roles/ewc_smoketests/meta/main.yml b/roles/StackStorm.ewc_smoketests/meta/main.yml similarity index 100% rename from roles/ewc_smoketests/meta/main.yml rename to roles/StackStorm.ewc_smoketests/meta/main.yml diff --git a/roles/ewc_smoketests/tasks/main.yml b/roles/StackStorm.ewc_smoketests/tasks/main.yml similarity index 100% rename from roles/ewc_smoketests/tasks/main.yml rename to roles/StackStorm.ewc_smoketests/tasks/main.yml diff --git a/roles/ewc_smoketests/tasks/teardown.yml b/roles/StackStorm.ewc_smoketests/tasks/teardown.yml similarity index 100% rename from roles/ewc_smoketests/tasks/teardown.yml rename to roles/StackStorm.ewc_smoketests/tasks/teardown.yml diff --git a/roles/ewc_smoketests/templates/rbac_assignments/assignments.yml.j2 b/roles/StackStorm.ewc_smoketests/templates/rbac_assignments/assignments.yml.j2 similarity index 100% rename from roles/ewc_smoketests/templates/rbac_assignments/assignments.yml.j2 rename to roles/StackStorm.ewc_smoketests/templates/rbac_assignments/assignments.yml.j2 diff --git a/roles/ewc_smoketests/templates/rbac_roles/roles.yml.j2 b/roles/StackStorm.ewc_smoketests/templates/rbac_roles/roles.yml.j2 similarity index 100% rename from roles/ewc_smoketests/templates/rbac_roles/roles.yml.j2 rename to roles/StackStorm.ewc_smoketests/templates/rbac_roles/roles.yml.j2 diff --git a/roles/mongodb/defaults/main.yml b/roles/StackStorm.mongodb/defaults/main.yml similarity index 100% rename from roles/mongodb/defaults/main.yml rename to roles/StackStorm.mongodb/defaults/main.yml diff --git a/roles/mongodb/handlers/main.yml b/roles/StackStorm.mongodb/handlers/main.yml similarity index 100% rename from roles/mongodb/handlers/main.yml rename to roles/StackStorm.mongodb/handlers/main.yml diff --git a/roles/mongodb/meta/main.yml b/roles/StackStorm.mongodb/meta/main.yml similarity index 93% rename from roles/mongodb/meta/main.yml rename to roles/StackStorm.mongodb/meta/main.yml index 7ea40ffa..7a8c5080 100644 --- a/roles/mongodb/meta/main.yml +++ b/roles/StackStorm.mongodb/meta/main.yml @@ -17,5 +17,5 @@ galaxy_info: galaxy_tags: - system dependencies: - - role: epel + - role: StackStorm.epel when: ansible_facts.os_family == 'RedHat' diff --git a/roles/mongodb/tasks/main.yml b/roles/StackStorm.mongodb/tasks/main.yml similarity index 100% rename from roles/mongodb/tasks/main.yml rename to roles/StackStorm.mongodb/tasks/main.yml diff --git a/roles/mongodb/tasks/mongodb_apt.yml b/roles/StackStorm.mongodb/tasks/mongodb_apt.yml similarity index 100% rename from roles/mongodb/tasks/mongodb_apt.yml rename to roles/StackStorm.mongodb/tasks/mongodb_apt.yml diff --git a/roles/mongodb/tasks/mongodb_auth.yml b/roles/StackStorm.mongodb/tasks/mongodb_auth.yml similarity index 100% rename from roles/mongodb/tasks/mongodb_auth.yml rename to roles/StackStorm.mongodb/tasks/mongodb_auth.yml diff --git a/roles/mongodb/tasks/mongodb_yum.yml b/roles/StackStorm.mongodb/tasks/mongodb_yum.yml similarity index 100% rename from roles/mongodb/tasks/mongodb_yum.yml rename to roles/StackStorm.mongodb/tasks/mongodb_yum.yml diff --git a/roles/mongodb/vars/main.yml b/roles/StackStorm.mongodb/vars/main.yml similarity index 100% rename from roles/mongodb/vars/main.yml rename to roles/StackStorm.mongodb/vars/main.yml diff --git a/roles/nginx/handlers/main.yml b/roles/StackStorm.nginx/handlers/main.yml similarity index 100% rename from roles/nginx/handlers/main.yml rename to roles/StackStorm.nginx/handlers/main.yml diff --git a/roles/nginx/meta/main.yml b/roles/StackStorm.nginx/meta/main.yml similarity index 100% rename from roles/nginx/meta/main.yml rename to roles/StackStorm.nginx/meta/main.yml diff --git a/roles/nginx/tasks/main.yml b/roles/StackStorm.nginx/tasks/main.yml similarity index 100% rename from roles/nginx/tasks/main.yml rename to roles/StackStorm.nginx/tasks/main.yml diff --git a/roles/nginx/tasks/nginx_apt.yml b/roles/StackStorm.nginx/tasks/nginx_apt.yml similarity index 100% rename from roles/nginx/tasks/nginx_apt.yml rename to roles/StackStorm.nginx/tasks/nginx_apt.yml diff --git a/roles/nginx/tasks/nginx_yum.yml b/roles/StackStorm.nginx/tasks/nginx_yum.yml similarity index 100% rename from roles/nginx/tasks/nginx_yum.yml rename to roles/StackStorm.nginx/tasks/nginx_yum.yml diff --git a/roles/nodejs/defaults/main.yml b/roles/StackStorm.nodejs/defaults/main.yml similarity index 100% rename from roles/nodejs/defaults/main.yml rename to roles/StackStorm.nodejs/defaults/main.yml diff --git a/roles/nodejs/meta/main.yml b/roles/StackStorm.nodejs/meta/main.yml similarity index 100% rename from roles/nodejs/meta/main.yml rename to roles/StackStorm.nodejs/meta/main.yml diff --git a/roles/nodejs/tasks/main.yml b/roles/StackStorm.nodejs/tasks/main.yml similarity index 100% rename from roles/nodejs/tasks/main.yml rename to roles/StackStorm.nodejs/tasks/main.yml diff --git a/roles/nodejs/tasks/nodejs_apt.yml b/roles/StackStorm.nodejs/tasks/nodejs_apt.yml similarity index 100% rename from roles/nodejs/tasks/nodejs_apt.yml rename to roles/StackStorm.nodejs/tasks/nodejs_apt.yml diff --git a/roles/nodejs/tasks/nodejs_yum.yml b/roles/StackStorm.nodejs/tasks/nodejs_yum.yml similarity index 100% rename from roles/nodejs/tasks/nodejs_yum.yml rename to roles/StackStorm.nodejs/tasks/nodejs_yum.yml diff --git a/roles/postgresql/meta/main.yml b/roles/StackStorm.postgresql/meta/main.yml similarity index 100% rename from roles/postgresql/meta/main.yml rename to roles/StackStorm.postgresql/meta/main.yml diff --git a/roles/postgresql/tasks/main.yml b/roles/StackStorm.postgresql/tasks/main.yml similarity index 100% rename from roles/postgresql/tasks/main.yml rename to roles/StackStorm.postgresql/tasks/main.yml diff --git a/roles/postgresql/tasks/postgresql_apt.yml b/roles/StackStorm.postgresql/tasks/postgresql_apt.yml similarity index 100% rename from roles/postgresql/tasks/postgresql_apt.yml rename to roles/StackStorm.postgresql/tasks/postgresql_apt.yml diff --git a/roles/postgresql/tasks/postgresql_yum6.yml b/roles/StackStorm.postgresql/tasks/postgresql_yum6.yml similarity index 100% rename from roles/postgresql/tasks/postgresql_yum6.yml rename to roles/StackStorm.postgresql/tasks/postgresql_yum6.yml diff --git a/roles/postgresql/tasks/postgresql_yum7.yml b/roles/StackStorm.postgresql/tasks/postgresql_yum7.yml similarity index 100% rename from roles/postgresql/tasks/postgresql_yum7.yml rename to roles/StackStorm.postgresql/tasks/postgresql_yum7.yml diff --git a/roles/rabbitmq/defaults/main.yml b/roles/StackStorm.rabbitmq/defaults/main.yml similarity index 100% rename from roles/rabbitmq/defaults/main.yml rename to roles/StackStorm.rabbitmq/defaults/main.yml diff --git a/roles/rabbitmq/handlers/main.yml b/roles/StackStorm.rabbitmq/handlers/main.yml similarity index 100% rename from roles/rabbitmq/handlers/main.yml rename to roles/StackStorm.rabbitmq/handlers/main.yml diff --git a/roles/rabbitmq/meta/main.yml b/roles/StackStorm.rabbitmq/meta/main.yml similarity index 100% rename from roles/rabbitmq/meta/main.yml rename to roles/StackStorm.rabbitmq/meta/main.yml diff --git a/roles/rabbitmq/tasks/main.yml b/roles/StackStorm.rabbitmq/tasks/main.yml similarity index 100% rename from roles/rabbitmq/tasks/main.yml rename to roles/StackStorm.rabbitmq/tasks/main.yml diff --git a/roles/rabbitmq/vars/main.yml b/roles/StackStorm.rabbitmq/vars/main.yml similarity index 100% rename from roles/rabbitmq/vars/main.yml rename to roles/StackStorm.rabbitmq/vars/main.yml diff --git a/roles/st2/defaults/main.yml b/roles/StackStorm.st2/defaults/main.yml similarity index 100% rename from roles/st2/defaults/main.yml rename to roles/StackStorm.st2/defaults/main.yml diff --git a/roles/st2/handlers/main.yml b/roles/StackStorm.st2/handlers/main.yml similarity index 100% rename from roles/st2/handlers/main.yml rename to roles/StackStorm.st2/handlers/main.yml diff --git a/roles/st2/meta/main.yml b/roles/StackStorm.st2/meta/main.yml similarity index 89% rename from roles/st2/meta/main.yml rename to roles/StackStorm.st2/meta/main.yml index 081a3c4f..2d623850 100644 --- a/roles/st2/meta/main.yml +++ b/roles/StackStorm.st2/meta/main.yml @@ -22,6 +22,6 @@ galaxy_info: - remediation - devops dependencies: - - role: epel + - role: StackStorm.epel when: ansible_facts.os_family == 'RedHat' - - role: st2repo + - role: StackStorm.st2repo diff --git a/roles/st2/tasks/auth.yml b/roles/StackStorm.st2/tasks/auth.yml similarity index 100% rename from roles/st2/tasks/auth.yml rename to roles/StackStorm.st2/tasks/auth.yml diff --git a/roles/st2/tasks/config.yml b/roles/StackStorm.st2/tasks/config.yml similarity index 100% rename from roles/st2/tasks/config.yml rename to roles/StackStorm.st2/tasks/config.yml diff --git a/roles/st2/tasks/datastore.yml b/roles/StackStorm.st2/tasks/datastore.yml similarity index 100% rename from roles/st2/tasks/datastore.yml rename to roles/StackStorm.st2/tasks/datastore.yml diff --git a/roles/st2/tasks/main.yml b/roles/StackStorm.st2/tasks/main.yml similarity index 100% rename from roles/st2/tasks/main.yml rename to roles/StackStorm.st2/tasks/main.yml diff --git a/roles/st2/tasks/proxy.yml b/roles/StackStorm.st2/tasks/proxy.yml similarity index 100% rename from roles/st2/tasks/proxy.yml rename to roles/StackStorm.st2/tasks/proxy.yml diff --git a/roles/st2/tasks/user.yml b/roles/StackStorm.st2/tasks/user.yml similarity index 100% rename from roles/st2/tasks/user.yml rename to roles/StackStorm.st2/tasks/user.yml diff --git a/roles/st2/tasks/version.yml b/roles/StackStorm.st2/tasks/version.yml similarity index 100% rename from roles/st2/tasks/version.yml rename to roles/StackStorm.st2/tasks/version.yml diff --git a/roles/st2/vars/main.yml b/roles/StackStorm.st2/vars/main.yml similarity index 100% rename from roles/st2/vars/main.yml rename to roles/StackStorm.st2/vars/main.yml diff --git a/roles/st2chatops/defaults/main.yml b/roles/StackStorm.st2chatops/defaults/main.yml similarity index 100% rename from roles/st2chatops/defaults/main.yml rename to roles/StackStorm.st2chatops/defaults/main.yml diff --git a/roles/st2chatops/handlers/main.yml b/roles/StackStorm.st2chatops/handlers/main.yml similarity index 100% rename from roles/st2chatops/handlers/main.yml rename to roles/StackStorm.st2chatops/handlers/main.yml diff --git a/roles/st2chatops/meta/main.yml b/roles/StackStorm.st2chatops/meta/main.yml similarity index 87% rename from roles/st2chatops/meta/main.yml rename to roles/StackStorm.st2chatops/meta/main.yml index 7b2f34ea..c7601641 100644 --- a/roles/st2chatops/meta/main.yml +++ b/roles/StackStorm.st2chatops/meta/main.yml @@ -22,5 +22,5 @@ galaxy_info: - automation - hubot dependencies: - - role: nodejs - - role: st2 + - role: StackStorm.nodejs + - role: StackStorm.st2 diff --git a/roles/st2chatops/tasks/main.yml b/roles/StackStorm.st2chatops/tasks/main.yml similarity index 100% rename from roles/st2chatops/tasks/main.yml rename to roles/StackStorm.st2chatops/tasks/main.yml diff --git a/roles/st2chatops/vars/main.yml b/roles/StackStorm.st2chatops/vars/main.yml similarity index 100% rename from roles/st2chatops/vars/main.yml rename to roles/StackStorm.st2chatops/vars/main.yml diff --git a/roles/st2mistral/defaults/main.yml b/roles/StackStorm.st2mistral/defaults/main.yml similarity index 100% rename from roles/st2mistral/defaults/main.yml rename to roles/StackStorm.st2mistral/defaults/main.yml diff --git a/roles/st2mistral/handlers/main.yml b/roles/StackStorm.st2mistral/handlers/main.yml similarity index 100% rename from roles/st2mistral/handlers/main.yml rename to roles/StackStorm.st2mistral/handlers/main.yml diff --git a/roles/st2mistral/meta/main.yml b/roles/StackStorm.st2mistral/meta/main.yml similarity index 87% rename from roles/st2mistral/meta/main.yml rename to roles/StackStorm.st2mistral/meta/main.yml index efdce976..bd003215 100644 --- a/roles/st2mistral/meta/main.yml +++ b/roles/StackStorm.st2mistral/meta/main.yml @@ -21,5 +21,5 @@ galaxy_info: - devops - workflows dependencies: - - role: postgresql - - role: st2repo + - role: StackStorm.postgresql + - role: StackStorm.st2repo diff --git a/roles/st2mistral/tasks/config.yml b/roles/StackStorm.st2mistral/tasks/config.yml similarity index 100% rename from roles/st2mistral/tasks/config.yml rename to roles/StackStorm.st2mistral/tasks/config.yml diff --git a/roles/st2mistral/tasks/main.yml b/roles/StackStorm.st2mistral/tasks/main.yml similarity index 100% rename from roles/st2mistral/tasks/main.yml rename to roles/StackStorm.st2mistral/tasks/main.yml diff --git a/roles/st2mistral/templates/init_mistral_db.SQL.j2 b/roles/StackStorm.st2mistral/templates/init_mistral_db.SQL.j2 similarity index 100% rename from roles/st2mistral/templates/init_mistral_db.SQL.j2 rename to roles/StackStorm.st2mistral/templates/init_mistral_db.SQL.j2 diff --git a/roles/st2mistral/vars/main.yml b/roles/StackStorm.st2mistral/vars/main.yml similarity index 100% rename from roles/st2mistral/vars/main.yml rename to roles/StackStorm.st2mistral/vars/main.yml diff --git a/roles/st2repo/defaults/main.yml b/roles/StackStorm.st2repo/defaults/main.yml similarity index 100% rename from roles/st2repo/defaults/main.yml rename to roles/StackStorm.st2repo/defaults/main.yml diff --git a/roles/st2repo/meta/main.yml b/roles/StackStorm.st2repo/meta/main.yml similarity index 100% rename from roles/st2repo/meta/main.yml rename to roles/StackStorm.st2repo/meta/main.yml diff --git a/roles/st2repo/tasks/main.yml b/roles/StackStorm.st2repo/tasks/main.yml similarity index 100% rename from roles/st2repo/tasks/main.yml rename to roles/StackStorm.st2repo/tasks/main.yml diff --git a/roles/st2repo/tasks/st2repo_apt.yml b/roles/StackStorm.st2repo/tasks/st2repo_apt.yml similarity index 100% rename from roles/st2repo/tasks/st2repo_apt.yml rename to roles/StackStorm.st2repo/tasks/st2repo_apt.yml diff --git a/roles/st2repo/tasks/st2repo_yum.yml b/roles/StackStorm.st2repo/tasks/st2repo_yum.yml similarity index 100% rename from roles/st2repo/tasks/st2repo_yum.yml rename to roles/StackStorm.st2repo/tasks/st2repo_yum.yml diff --git a/roles/st2repo/vars/stable.yml b/roles/StackStorm.st2repo/vars/stable.yml similarity index 100% rename from roles/st2repo/vars/stable.yml rename to roles/StackStorm.st2repo/vars/stable.yml diff --git a/roles/st2repo/vars/staging-stable.yml b/roles/StackStorm.st2repo/vars/staging-stable.yml similarity index 100% rename from roles/st2repo/vars/staging-stable.yml rename to roles/StackStorm.st2repo/vars/staging-stable.yml diff --git a/roles/st2repo/vars/staging-unstable.yml b/roles/StackStorm.st2repo/vars/staging-unstable.yml similarity index 100% rename from roles/st2repo/vars/staging-unstable.yml rename to roles/StackStorm.st2repo/vars/staging-unstable.yml diff --git a/roles/st2repo/vars/unstable.yml b/roles/StackStorm.st2repo/vars/unstable.yml similarity index 100% rename from roles/st2repo/vars/unstable.yml rename to roles/StackStorm.st2repo/vars/unstable.yml diff --git a/roles/st2smoketests/tasks/main.yml b/roles/StackStorm.st2smoketests/tasks/main.yml similarity index 100% rename from roles/st2smoketests/tasks/main.yml rename to roles/StackStorm.st2smoketests/tasks/main.yml diff --git a/roles/st2smoketests/tasks/st2chatops.yml b/roles/StackStorm.st2smoketests/tasks/st2chatops.yml similarity index 100% rename from roles/st2smoketests/tasks/st2chatops.yml rename to roles/StackStorm.st2smoketests/tasks/st2chatops.yml diff --git a/roles/st2web/defaults/main.yml b/roles/StackStorm.st2web/defaults/main.yml similarity index 100% rename from roles/st2web/defaults/main.yml rename to roles/StackStorm.st2web/defaults/main.yml diff --git a/roles/st2web/meta/main.yml b/roles/StackStorm.st2web/meta/main.yml similarity index 80% rename from roles/st2web/meta/main.yml rename to roles/StackStorm.st2web/meta/main.yml index eadd1d51..7afe6f68 100644 --- a/roles/st2web/meta/main.yml +++ b/roles/StackStorm.st2web/meta/main.yml @@ -18,6 +18,6 @@ galaxy_info: galaxy_tags: - system dependencies: - - role: nginx - - role: st2repo - - role: st2 + - role: StackStorm.nginx + - role: StackStorm.st2repo + - role: StackStorm.st2 diff --git a/roles/st2web/tasks/certificate.yml b/roles/StackStorm.st2web/tasks/certificate.yml similarity index 100% rename from roles/st2web/tasks/certificate.yml rename to roles/StackStorm.st2web/tasks/certificate.yml diff --git a/roles/st2web/tasks/main.yml b/roles/StackStorm.st2web/tasks/main.yml similarity index 100% rename from roles/st2web/tasks/main.yml rename to roles/StackStorm.st2web/tasks/main.yml diff --git a/roles/st2web/vars/main.yml b/roles/StackStorm.st2web/vars/main.yml similarity index 100% rename from roles/st2web/vars/main.yml rename to roles/StackStorm.st2web/vars/main.yml diff --git a/stackstorm.yml b/stackstorm.yml index 4744e6f2..de2583ff 100644 --- a/stackstorm.yml +++ b/stackstorm.yml @@ -2,18 +2,18 @@ - name: Install st2 hosts: all roles: - - mongodb - - rabbitmq - - postgresql - - st2repo - - st2 - - st2mistral - - nginx - - st2web - - nodejs - - st2chatops - - st2smoketests - - role: ewc + - StackStorm.mongodb + - StackStorm.rabbitmq + - StackStorm.postgresql + - StackStorm.st2repo + - StackStorm.st2 + - StackStorm.st2mistral + - StackStorm.nginx + - StackStorm.st2web + - StackStorm.nodejs + - StackStorm.st2chatops + - StackStorm.st2smoketests + - role: StackStorm.ewc when: ewc_license is defined and ewc_license is not none - - role: ewc_smoketests + - role: StackStorm.ewc_smoketests when: ewc_license is defined and ewc_license is not none From 6961c57fedf946eb5b93022f502c4708abfdcdea Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Tue, 29 Jan 2019 15:57:49 -0600 Subject: [PATCH 2/3] Fix role meta dependencies Namespace roles in meta dependencies that were missed due to improperly nesting `dependencies` under `galaxy_info`. Also fixes spacing. --- roles/StackStorm.ewc/meta/main.yml | 8 ++++---- roles/StackStorm.ewc_smoketests/meta/main.yml | 10 +++++----- roles/StackStorm.st2chatops/meta/main.yml | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/roles/StackStorm.ewc/meta/main.yml b/roles/StackStorm.ewc/meta/main.yml index bcce0638..deced213 100644 --- a/roles/StackStorm.ewc/meta/main.yml +++ b/roles/StackStorm.ewc/meta/main.yml @@ -21,7 +21,7 @@ galaxy_info: - ewc - repositories - packagecloud - dependencies: - - role: st2repo - - role: st2 - - role: st2web +dependencies: + - role: StackStorm.st2repo + - role: StackStorm.st2 + - role: StackStorm.st2web diff --git a/roles/StackStorm.ewc_smoketests/meta/main.yml b/roles/StackStorm.ewc_smoketests/meta/main.yml index 9e1b4ff7..ee6922f7 100644 --- a/roles/StackStorm.ewc_smoketests/meta/main.yml +++ b/roles/StackStorm.ewc_smoketests/meta/main.yml @@ -20,8 +20,8 @@ galaxy_info: - ewc - repositories - packagecloud - dependencies: - - role: st2repo - - role: st2 - - role: st2web - - role: ewc +dependencies: + - role: StackStorm.st2repo + - role: StackStorm.st2 + - role: StackStorm.st2web + - role: StackStorm.ewc diff --git a/roles/StackStorm.st2chatops/meta/main.yml b/roles/StackStorm.st2chatops/meta/main.yml index c7601641..8f87d902 100644 --- a/roles/StackStorm.st2chatops/meta/main.yml +++ b/roles/StackStorm.st2chatops/meta/main.yml @@ -22,5 +22,5 @@ galaxy_info: - automation - hubot dependencies: - - role: StackStorm.nodejs - - role: StackStorm.st2 + - role: StackStorm.nodejs + - role: StackStorm.st2 From ea4cd8b6f1727d1bdbb6be877c8ec25a2c2bd0e2 Mon Sep 17 00:00:00 2001 From: armab Date: Wed, 30 Jan 2019 20:16:11 +0100 Subject: [PATCH 3/3] Re-run TravisCI build