From 5d8b3d7502cabefb4397c6963f7ac73a856fea65 Mon Sep 17 00:00:00 2001 From: bigmstone Date: Tue, 28 Mar 2017 17:23:48 -0500 Subject: [PATCH 1/2] Moving from system to st2kv.system --- actions/create_docs_test_rule.py | 2 +- actions/flow_pkg.meta.yaml | 2 +- actions/pypi_upload.meta.yaml | 4 ++-- actions/st2_auth_ldap_pkg_enterprise.meta.yaml | 2 +- actions/st2_auth_pam_pkg.yaml | 2 +- actions/st2_upgrade_to_enterprise.meta.yaml | 10 +++++----- rules/st2_docs_prod.yaml | 2 +- rules/st2_docs_v14.yaml | 2 +- rules/st2_docs_v15.yaml | 2 +- rules/st2_docs_v16.yaml | 2 +- rules/st2_docs_v20.yaml | 2 +- rules/st2_docs_v21.yaml | 2 +- rules/st2_docs_v22.yaml | 2 +- rules/st2_pkg_prod_v0.12_ubuntu14.yaml | 2 +- rules/st2_pkg_prod_v0.9_ubuntu14.yaml | 2 +- rules/st2_pkg_test_stable_rhel6_enterprise.yaml | 2 +- rules/st2_pkg_test_stable_rhel7_enterprise.yaml | 2 +- rules/st2_pkg_test_stable_u14_enterprise.yaml | 2 +- rules/st2_pkg_test_stable_u16_enterprise.yaml | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/actions/create_docs_test_rule.py b/actions/create_docs_test_rule.py index 80f50073..080f6a00 100644 --- a/actions/create_docs_test_rule.py +++ b/actions/create_docs_test_rule.py @@ -86,7 +86,7 @@ def main(args): 'branch': args.branch, 'author': '{{trigger.body.head_commit.author.username}}', 'environment': 'production', - 'docs_url': '{{system.s3_bucket_docs_production}}' + 'docs_url': '{{st2kv.system.s3_bucket_docs_production}}' } } } diff --git a/actions/flow_pkg.meta.yaml b/actions/flow_pkg.meta.yaml index 949ff045..a809a45d 100644 --- a/actions/flow_pkg.meta.yaml +++ b/actions/flow_pkg.meta.yaml @@ -8,7 +8,7 @@ repo: type: "string" description: "Url of the repo to clone." - default: "https://{{system.st2_github_token}}:x-oauth-basic@github.com/StackStorm/st2flow.git" + default: "https://{{st2kv.system.st2_github_token}}:x-oauth-basic@github.com/StackStorm/st2flow.git" required: false repo_target: type: "string" diff --git a/actions/pypi_upload.meta.yaml b/actions/pypi_upload.meta.yaml index 4eff297c..5e75e488 100644 --- a/actions/pypi_upload.meta.yaml +++ b/actions/pypi_upload.meta.yaml @@ -32,13 +32,13 @@ parameters: pypi_username: type: string description: Username to login to pypi - default: "{{system.st2_pypi_username}}" + default: "{{st2kv.system.st2_pypi_username}}" secret: true position: 5 pypi_password: type: string description: Password for the pypi account - default: "{{system.st2_pypi_password}}" + default: "{{st2kv.system.st2_pypi_password}}" secret: true position: 6 dir: diff --git a/actions/st2_auth_ldap_pkg_enterprise.meta.yaml b/actions/st2_auth_ldap_pkg_enterprise.meta.yaml index 41b63303..62aa3d66 100644 --- a/actions/st2_auth_ldap_pkg_enterprise.meta.yaml +++ b/actions/st2_auth_ldap_pkg_enterprise.meta.yaml @@ -18,7 +18,7 @@ github_token: type: "string" description: "GitHub auth token" - default: "{{system.st2_github_token}}" + default: "{{st2kv.system.st2_github_token}}" repo_name: type: "string" description: "GitHub repo ex. ORG/REPO" diff --git a/actions/st2_auth_pam_pkg.yaml b/actions/st2_auth_pam_pkg.yaml index 802dff43..875b78f0 100644 --- a/actions/st2_auth_pam_pkg.yaml +++ b/actions/st2_auth_pam_pkg.yaml @@ -18,7 +18,7 @@ github_token: type: "string" description: "GitHub auth token" - default: "{{system.st2_github_token}}" + default: "{{st2kv.system.st2_github_token}}" repo_name: type: "string" description: "GitHub repo ex. ORG/REPO" diff --git a/actions/st2_upgrade_to_enterprise.meta.yaml b/actions/st2_upgrade_to_enterprise.meta.yaml index 60458dd7..72956b52 100644 --- a/actions/st2_upgrade_to_enterprise.meta.yaml +++ b/actions/st2_upgrade_to_enterprise.meta.yaml @@ -37,23 +37,23 @@ parameters: position: 4 ldap_host: type: string - default: "{{system.enterprise_ad_host}}" + default: "{{st2kv.system.enterprise_ad_host}}" position: 5 ldap_bind_dn: type: string - default: "{{system.enterprise_ad_bind_dn}}" + default: "{{st2kv.system.enterprise_ad_bind_dn}}" position: 6 ldap_bind_passwd: type: string - default: "{{system.enterprise_ad_bind_passwd}}" + default: "{{st2kv.system.enterprise_ad_bind_passwd}}" position: 7 ldap_base_ou: type: string - default: "{{system.enterprise_ad_base_ou}}" + default: "{{st2kv.system.enterprise_ad_base_ou}}" position: 8 ldap_group_dn: type: string - default: "{{system.enterprise_ad_group_dn}}" + default: "{{st2kv.system.enterprise_ad_group_dn}}" position: 9 dir: immutable: true diff --git a/rules/st2_docs_prod.yaml b/rules/st2_docs_prod.yaml index 787d5e1e..265e344f 100644 --- a/rules/st2_docs_prod.yaml +++ b/rules/st2_docs_prod.yaml @@ -19,4 +19,4 @@ revision: "{{trigger.body.head_commit.id}}" author: "{{trigger.body.head_commit.author.username}}" environment: "production" - docs_url: "{{system.s3_bucket_docs_production}}" + docs_url: "{{st2kv.system.s3_bucket_docs_production}}" diff --git a/rules/st2_docs_v14.yaml b/rules/st2_docs_v14.yaml index 65912518..ace3c05a 100644 --- a/rules/st2_docs_v14.yaml +++ b/rules/st2_docs_v14.yaml @@ -19,4 +19,4 @@ revision: "{{trigger.body.head_commit.id}}" author: "{{trigger.body.head_commit.author.username}}" environment: "production" - docs_url: "{{system.s3_bucket_docs_production}}" + docs_url: "{{st2kv.system.s3_bucket_docs_production}}" diff --git a/rules/st2_docs_v15.yaml b/rules/st2_docs_v15.yaml index c0cf3ed4..d423d53b 100644 --- a/rules/st2_docs_v15.yaml +++ b/rules/st2_docs_v15.yaml @@ -19,4 +19,4 @@ revision: "{{trigger.body.head_commit.id}}" author: "{{trigger.body.head_commit.author.username}}" environment: "production" - docs_url: "{{system.s3_bucket_docs_production}}" + docs_url: "{{st2kv.system.s3_bucket_docs_production}}" diff --git a/rules/st2_docs_v16.yaml b/rules/st2_docs_v16.yaml index 4f5e6bf6..2bd98401 100644 --- a/rules/st2_docs_v16.yaml +++ b/rules/st2_docs_v16.yaml @@ -19,4 +19,4 @@ revision: "{{trigger.body.head_commit.id}}" author: "{{trigger.body.head_commit.author.username}}" environment: "production" - docs_url: "{{system.s3_bucket_docs_production}}" + docs_url: "{{st2kv.system.s3_bucket_docs_production}}" diff --git a/rules/st2_docs_v20.yaml b/rules/st2_docs_v20.yaml index 50d2ac61..3ed6ca8e 100644 --- a/rules/st2_docs_v20.yaml +++ b/rules/st2_docs_v20.yaml @@ -20,4 +20,4 @@ revision: "{{trigger.body.head_commit.id}}" author: "{{trigger.body.head_commit.author.username}}" environment: "production" - docs_url: "{{system.s3_bucket_docs_production}}" + docs_url: "{{st2kv.system.s3_bucket_docs_production}}" diff --git a/rules/st2_docs_v21.yaml b/rules/st2_docs_v21.yaml index de70bf43..ec1ff9cf 100644 --- a/rules/st2_docs_v21.yaml +++ b/rules/st2_docs_v21.yaml @@ -20,4 +20,4 @@ revision: "{{trigger.body.head_commit.id}}" author: "{{trigger.body.head_commit.author.username}}" environment: "production" - docs_url: "{{system.s3_bucket_docs_production}}" + docs_url: "{{st2kv.system.s3_bucket_docs_production}}" diff --git a/rules/st2_docs_v22.yaml b/rules/st2_docs_v22.yaml index f4237bae..dc508cfa 100644 --- a/rules/st2_docs_v22.yaml +++ b/rules/st2_docs_v22.yaml @@ -20,4 +20,4 @@ revision: "{{trigger.body.head_commit.id}}" author: "{{trigger.body.head_commit.author.username}}" environment: "production" - docs_url: "{{system.s3_bucket_docs_production}}" + docs_url: "{{st2kv.system.s3_bucket_docs_production}}" diff --git a/rules/st2_pkg_prod_v0.12_ubuntu14.yaml b/rules/st2_pkg_prod_v0.12_ubuntu14.yaml index fd715686..f4f923bc 100644 --- a/rules/st2_pkg_prod_v0.12_ubuntu14.yaml +++ b/rules/st2_pkg_prod_v0.12_ubuntu14.yaml @@ -23,7 +23,7 @@ parameters: repo: "{{trigger.parameters.repo}}" branch: "{{trigger.parameters.branch}}" - dl_server: "{{system.apt_origin_production}}" + dl_server: "{{st2kv.system.apt_origin_production}}" environment: "production" revision: "{{trigger.parameters.revision}}" build: "{{trigger.parameters.build}}" diff --git a/rules/st2_pkg_prod_v0.9_ubuntu14.yaml b/rules/st2_pkg_prod_v0.9_ubuntu14.yaml index 5ad44cdb..fc7b017c 100644 --- a/rules/st2_pkg_prod_v0.9_ubuntu14.yaml +++ b/rules/st2_pkg_prod_v0.9_ubuntu14.yaml @@ -22,7 +22,7 @@ parameters: repo: "{{trigger.parameters.repo}}" branch: "{{trigger.parameters.branch}}" - dl_server: "{{system.apt_origin_production}}" + dl_server: "{{st2kv.system.apt_origin_production}}" environment: "production" revision: "{{trigger.parameters.revision}}" build: "{{trigger.parameters.build}}" \ No newline at end of file diff --git a/rules/st2_pkg_test_stable_rhel6_enterprise.yaml b/rules/st2_pkg_test_stable_rhel6_enterprise.yaml index 46a4973f..7355ff23 100644 --- a/rules/st2_pkg_test_stable_rhel6_enterprise.yaml +++ b/rules/st2_pkg_test_stable_rhel6_enterprise.yaml @@ -23,4 +23,4 @@ action: release: stable version: "2.2.0" enterprise: true - enterprise_key: "{{system.enterprise_key_prd_stable}}" + enterprise_key: "{{st2kv.system.enterprise_key_prd_stable}}" diff --git a/rules/st2_pkg_test_stable_rhel7_enterprise.yaml b/rules/st2_pkg_test_stable_rhel7_enterprise.yaml index fda22a6b..80d355fe 100644 --- a/rules/st2_pkg_test_stable_rhel7_enterprise.yaml +++ b/rules/st2_pkg_test_stable_rhel7_enterprise.yaml @@ -23,4 +23,4 @@ action: release: stable version: "2.2.0" enterprise: true - enterprise_key: "{{system.enterprise_key_prd_stable}}" + enterprise_key: "{{st2kv.system.enterprise_key_prd_stable}}" diff --git a/rules/st2_pkg_test_stable_u14_enterprise.yaml b/rules/st2_pkg_test_stable_u14_enterprise.yaml index 63cde9bf..e4653c96 100644 --- a/rules/st2_pkg_test_stable_u14_enterprise.yaml +++ b/rules/st2_pkg_test_stable_u14_enterprise.yaml @@ -23,4 +23,4 @@ action: release: stable version: "2.2.0" enterprise: true - enterprise_key: "{{system.enterprise_key_prd_stable}}" + enterprise_key: "{{st2kv.system.enterprise_key_prd_stable}}" diff --git a/rules/st2_pkg_test_stable_u16_enterprise.yaml b/rules/st2_pkg_test_stable_u16_enterprise.yaml index b0ab8d97..c5a407db 100644 --- a/rules/st2_pkg_test_stable_u16_enterprise.yaml +++ b/rules/st2_pkg_test_stable_u16_enterprise.yaml @@ -23,4 +23,4 @@ action: release: stable version: "2.2.0" enterprise: true - enterprise_key: "{{system.enterprise_key_prd_stable}}" + enterprise_key: "{{st2kv.system.enterprise_key_prd_stable}}" From 31a44013ad865f5c4c7072fdeff5de312e71fbc9 Mon Sep 17 00:00:00 2001 From: bigmstone Date: Wed, 29 Mar 2017 14:54:42 -0500 Subject: [PATCH 2/2] Adding skipped system references --- actions/workflows/bwc_docs.yaml | 2 +- actions/workflows/st2_docs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/workflows/bwc_docs.yaml b/actions/workflows/bwc_docs.yaml index 4147aa7a..fc17d0b3 100755 --- a/actions/workflows/bwc_docs.yaml +++ b/actions/workflows/bwc_docs.yaml @@ -46,7 +46,7 @@ params: hosts: "{{build_server}}" repo: "/tmp/{{repodir}}/docs/build/html" - location: "{% if branch == 'master' %}/latest/{% elif version|string() == system.st2_stable_version|string() %}/{% endif %}" + location: "{% if branch == 'master' %}/latest/{% elif version|string() == st2kv.system.st2_stable_version|string() %}/{% endif %}" bucket: "{{docs_url}}" version: "/{{version}}/" on-success: "clean_repo" diff --git a/actions/workflows/st2_docs.yaml b/actions/workflows/st2_docs.yaml index 5f2150d4..046ab564 100755 --- a/actions/workflows/st2_docs.yaml +++ b/actions/workflows/st2_docs.yaml @@ -54,7 +54,7 @@ params: hosts: "{{build_server}}" repo: "/tmp/{{repodir}}/docs/build/html" - location: "{% if branch == 'master' %}/latest/{% elif version|string() == system.st2_stable_version|string() %}/{% endif %}" + location: "{% if branch == 'master' %}/latest/{% elif version|string() == st2kv.system.st2_stable_version|string() %}/{% endif %}" bucket: "{% if environment == 'production' %}docs.stackstorm.com{% else %}{{docs_url}}{% endif %}" version: "/{{version}}/" on-success: "clean_repo"