diff --git a/hot/monasca/autoscaling.yaml b/hot/monasca/autoscaling.yaml deleted file mode 100644 index 51b86e7b..00000000 --- a/hot/monasca/autoscaling.yaml +++ /dev/null @@ -1,86 +0,0 @@ -heat_template_version: 2015-10-15 - -description: > - Example of using monasca resources for auto-scale testing. In this template, - sample scale-group is created with given nova instance to auto-scale - when cpu utilization varies between 15 to 50 percent for 3 times consequently. - -parameters: - flavor: - type: string - description: Flavor for the instances to be created - default: m1.nano - image: - type: string - description: Name or ID of the image to use for the instances. - -resources: - group: - type: OS::Heat::AutoScalingGroup - properties: - cooldown: 60 - desired_capacity: 2 - max_size: 5 - min_size: 1 - resource: - type: OS::Nova::Server - properties: - flavor: { get_param: flavor } - image: { get_param: image } - metadata: {"scale_group": {get_param: "OS::stack_id"}} - - scale_up_policy: - type: OS::Heat::ScalingPolicy - properties: - adjustment_type: change_in_capacity - auto_scaling_group_id: { get_resource: group } - cooldown: 60 - scaling_adjustment: 1 - - scale_down_policy: - type: OS::Heat::ScalingPolicy - properties: - adjustment_type: change_in_capacity - auto_scaling_group_id: { get_resource: group } - cooldown: 60 - scaling_adjustment: -1 - - up_notification: - type: OS::Monasca::Notification - properties: - type: webhook - address: {get_attr: [scale_up_policy, alarm_url]} - - down_notification: - type: OS::Monasca::Notification - properties: - type: webhook - address: {get_attr: [scale_down_policy, alarm_url]} - - cpu_alarm_high: - type: OS::Monasca::AlarmDefinition - properties: - name: CPU utilization beyond 50 percent - description: CPU utilization reached beyond 50 percent - expression: - str_replace: - template: avg(cpu.utilization_perc{scale_group=scale_group_id}) > 50 times 3 - params: - scale_group_id: {get_param: "OS::stack_id"} - severity: high - alarm_actions: - - {get_resource: up_notification } - - cpu_alarm_low: - type: OS::Monasca::AlarmDefinition - properties: - name: CPU utilization less than 15 percent - description: CPU utilization less than 15 percent - expression: - str_replace: - template: avg(cpu.utilization_perc{scale_group=scale_group_id}) < 15 times 3 - params: - scale_group_id: {get_param: "OS::stack_id"} - severity: low - alarm_actions: - - {get_resource: down_notification} diff --git a/roles/run-heat-template-check/tasks/main.yaml b/roles/run-heat-template-check/tasks/main.yaml index d5358de7..dfb1a6c8 100644 --- a/roles/run-heat-template-check/tasks/main.yaml +++ b/roles/run-heat-template-check/tasks/main.yaml @@ -10,8 +10,6 @@ get_or_create_endpoint $aodh_service "$REGION_NAME" "http://localhost" mistral_service=$(get_or_create_service "mistral" "workflowv2" "Workflow Service v2") get_or_create_endpoint $mistral_service "$REGION_NAME" "http://localhost" - monasca_service=$(get_or_create_service "monasca" "monitoring" "Monasca Monitoring Service") - get_or_create_endpoint $monasca_service "$REGION_NAME" "http://localhost" zaqar_service=$(get_or_create_service "zaqar" "messaging" "Zaqar Service") get_or_create_endpoint $zaqar_service "$REGION_NAME" "http://localhost" designate_service=$(get_or_create_service "designate" "dns" "Designate DNS Service") diff --git a/tools/post_test_hook.sh b/tools/post_test_hook.sh index f894871f..7c3a200c 100755 --- a/tools/post_test_hook.sh +++ b/tools/post_test_hook.sh @@ -24,8 +24,6 @@ aodh_service=$(get_or_create_service "aodh" "alarming" "OpenStack Alarming Servi get_or_create_endpoint $aodh_service "$REGION_NAME" "http://localhost" mistral_service=$(get_or_create_service "mistral" "workflowv2" "Workflow Service v2") get_or_create_endpoint $mistral_service "$REGION_NAME" "http://localhost" -monasca_service=$(get_or_create_service "monasca" "monitoring" "Monasca Monitoring Service") -get_or_create_endpoint $monasca_service "$REGION_NAME" "http://localhost" zaqar_service=$(get_or_create_service "zaqar" "messaging" "Zaqar Service") get_or_create_endpoint $zaqar_service "$REGION_NAME" "http://localhost" designate_service=$(get_or_create_service "designate" "dns" "Designate DNS Service")