Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion actions/create_docs_test_rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}}'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion actions/flow_pkg.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions actions/pypi_upload.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion actions/st2_auth_ldap_pkg_enterprise.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion actions/st2_auth_pam_pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions actions/st2_upgrade_to_enterprise.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion actions/workflows/bwc_docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion actions/workflows/st2_docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rules/st2_docs_prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_docs_v14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_docs_v15.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_docs_v16.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_docs_v20.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_docs_v21.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_docs_v22.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_pkg_prod_v0.12_ubuntu14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_pkg_prod_v0.9_ubuntu14.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_pkg_test_stable_rhel6_enterprise.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_pkg_test_stable_rhel7_enterprise.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_pkg_test_stable_u14_enterprise.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
2 changes: 1 addition & 1 deletion rules/st2_pkg_test_stable_u16_enterprise.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"