commit 0822a0749f16fcd16498e6f0fdb6d864a552483b
author Jenkins <jenkins@review.openstack.org> Wed Jun 22 12:07:09 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jun 22 12:07:09 2016 +0000
tree 8af641cd6a9029cf9944b9012f4f0d23908047ee
parent 5d469c4f49c4b68e2ad5eec490e7e4ecf02447aa
parent 12b5aec1910a76e0e491c3ed01eeb49a713374f9

Merge "Use trusts in Heat integration test"

ceilometer/tests/integration/gabbi/gabbits-live/create_stack.json

diff --git a/ceilometer/tests/integration/gabbi/gabbits-live/create_stack.json b/ceilometer/tests/integration/gabbi/gabbits-live/create_stack.json
index 7b3d3b4..3f2971a 100644
--- a/ceilometer/tests/integration/gabbi/gabbits-live/create_stack.json
+++ b/ceilometer/tests/integration/gabbi/gabbits-live/create_stack.json
@@ -49,7 +49,14 @@
                     "threshold": 10,
                     "comparison_operator": "gt",
                     "alarm_actions": [
-                        { "get_attr": [ "web_server_scaleup_policy", "alarm_url" ] }
+                        {
+                            "str_replace": {
+                                "template": "trust+url",
+                                "params": {
+                                    "url": { "get_attr": [ "web_server_scaleup_policy", "signal_url" ] }
+                                }
+                            }
+                        }
                     ],
                     "resource_type": "instance",
                     "query": {

ceilometer/tests/integration/gabbi/gabbits-live/update_stack.json

diff --git a/ceilometer/tests/integration/gabbi/gabbits-live/update_stack.json b/ceilometer/tests/integration/gabbi/gabbits-live/update_stack.json
index 8897d39..d593b0b 100644
--- a/ceilometer/tests/integration/gabbi/gabbits-live/update_stack.json
+++ b/ceilometer/tests/integration/gabbi/gabbits-live/update_stack.json
@@ -48,7 +48,14 @@
                     "threshold": 10,
                     "comparison_operator": "gt",
                     "alarm_actions": [
-                        { "get_attr": [ "web_server_scaledown_policy", "alarm_url" ] }
+                        {
+                            "str_replace": {
+                                "template": "trust+url",
+                                "params": {
+                                    "url": { "get_attr": [ "web_server_scaledown_policy", "signal_url" ] }
+                                }
+                            }
+                        }
                     ],
                     "resource_type": "instance",
                     "query": {