Merge "tosca.policies.tacker.Scaling of tacker_defs.yaml define incorrect"

This commit is contained in:
Zuul 2018-11-26 13:23:21 +00:00 committed by Gerrit Code Review
commit 92ee4eddcd
2 changed files with 12 additions and 19 deletions

View File

@ -41,12 +41,6 @@ Tacker defines TOSCA schema for the scaling policy as given below:
type: integer type: integer
required: true required: true
description: Number of nodes to add or remove during the scale out/in. description: Number of nodes to add or remove during the scale out/in.
targets:
type: list
entry_schema:
type: string
required: true
description: List of Scaling nodes.
min_instances: min_instances:
type: integer type: integer
required: true required: true
@ -65,6 +59,12 @@ Tacker defines TOSCA schema for the scaling policy as given below:
default: 120 default: 120
description: Wait time (in seconds) between consecutive scaling description: Wait time (in seconds) between consecutive scaling
operations. During the cooldown period, scaling action will be ignored operations. During the cooldown period, scaling action will be ignored
targets:
type: list
entry_schema:
type: string
required: true
description: List of Scaling nodes.
Sample TOSCA with scaling policy Sample TOSCA with scaling policy
@ -77,13 +77,15 @@ and vdu2 are already defined VDUs.
policies: policies:
sp1: - sp1:
type: tosca.policies.tacker.Scaling type: tosca.policies.tacker.Scaling
description: Simple VDU scaling description: Simple VDU scaling
properties: targets: [vdu1, vdu2]
properties:
min_instances: 1 min_instances: 1
max_instances: 3 max_instances: 3
@ -92,9 +94,6 @@ and vdu2 are already defined VDUs.
increment: 1 increment: 1
targets: [vdu1, vdu2]
Deploying scaling TOSCA template using Tacker Deploying scaling TOSCA template using Tacker
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

View File

@ -317,12 +317,6 @@ policy_types:
type: integer type: integer
required: true required: true
description: Number of nodes to add or remove during the scale out/in. description: Number of nodes to add or remove during the scale out/in.
targets:
type: list
entry_schema:
type: string
required: true
description: List of Scaling nodes.
target_cpu_utilization_percentage: target_cpu_utilization_percentage:
type: integer type: integer
required: false required: false