Skip to content

Commit 94664b9

Browse files
committed
Merge branch 'master' of github.com:StackStorm-Exchange/stackstorm-consul
Conflicts: actions/catalog_datacenters.yaml actions/catalog_deregister.yaml actions/catalog_node.yaml actions/catalog_register.yaml actions/delete.yaml actions/get.yaml actions/health_check.yaml actions/health_service.yaml actions/lib/action.py actions/list_nodes.yaml actions/list_services.yaml actions/parse_nodes.yaml actions/put.yaml actions/query_service.yaml
2 parents d331fe6 + 2892995 commit 94664b9

12 files changed

+16
-12
lines changed

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## 0.5.0
4+
5+
- Updated action `runner_type` from `run-python` to `python-script`
6+
37
## 0.4.0
48

59
- Added consul.health_service action to query a services status and group the result by hostname

actions/acl_create.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: acl_create
22
pack: consul
3-
runner_type: run-python
3+
runner_type: python-script
44
description: "Create an acl token"
55
enabled: true
66
entry_point: "acl_create.py"

actions/acl_destroy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: acl_destroy
22
pack: consul
3-
runner_type: run-python
3+
runner_type: python-script
44
description: "Destroy an acl token"
55
enabled: true
66
entry_point: "acl_destroy.py"

actions/acl_list.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: acl_list
22
pack: consul
3-
runner_type: run-python
3+
runner_type: python-script
44
description: "List all acl tokens"
55
enabled: true
66
entry_point: "acl_list.py"

actions/catalog_datacenters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: catalog_datacenters
2-
runner_type: run-python
2+
runner_type: python-script
33
description: "Real-time query of all known datacenters in Consul"
44
enabled: true
55
entry_point: "catalog_datacenters.py"

actions/catalog_deregister.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: catalog_deregister
2-
runner_type: run-python
2+
runner_type: python-script
33
description: "Deregister an external service in Consul"
44
enabled: true
55
entry_point: "catalog_deregister.py"

actions/catalog_node.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: catalog_node
2-
runner_type: run-python
2+
runner_type: python-script
33
description: "Query details about a node in consul"
44
enabled: true
55
entry_point: "catalog_node.py"

actions/catalog_register.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: catalog_register
2-
runner_type: run-python
2+
runner_type: python-script
33
description: "Register an external service in Consul"
44
enabled: true
55
entry_point: "catalog_register.py"

actions/health_service.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: health_service
2-
runner_type: run-python
3-
description: "Returns the nodes and health info of a service"
2+
runner_type: python-script
3+
description: "Query health status of a service in consul"
44
enabled: true
55
entry_point: "health_service.py"
66
parameters:

actions/kv_list.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: list
2-
runner_type: run-python
2+
runner_type: python-script
33
description: "List values from Consul server"
44
enabled: true
55
entry_point: "kv_get.py"

0 commit comments

Comments
 (0)