diff options
Diffstat (limited to 'docker/storperf-master/storperf/resources/hot/agent-group.yaml')
| -rw-r--r-- | docker/storperf-master/storperf/resources/hot/agent-group.yaml | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/docker/storperf-master/storperf/resources/hot/agent-group.yaml b/docker/storperf-master/storperf/resources/hot/agent-group.yaml index 3c02e31..f09d95a 100644 --- a/docker/storperf-master/storperf/resources/hot/agent-group.yaml +++ b/docker/storperf-master/storperf/resources/hot/agent-group.yaml @@ -7,7 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -heat_template_version: 2013-05-23 +heat_template_version: newton parameters: public_network: @@ -20,6 +20,12 @@ parameters: agent_image: type: string default: 'StorPerf Ubuntu 14.04' + volume_count: + type: number + default: 0 + constraints: + - range: { min: 0, max: 512 } + description: must be between 1 and 512 agents. volume_size: type: number description: Size of the volume to be created. @@ -27,6 +33,9 @@ parameters: constraints: - range: { min: 1, max: 1024 } description: must be between 1 and 1024 Gb. + volume_type: + type: string + default: 'None' agent_count: type: number default: 1 @@ -36,6 +45,12 @@ parameters: availability_zone: type: string default: nova + subnet_CIDR: + type: string + default: '172.16.0.0/16' + keypair_name: + type: string + default: storperf_agent_keypair resources: slaves: @@ -54,21 +69,20 @@ resources: availability_zone: {get_param: availability_zone}, storperf_open_security_group: {get_resource: storperf_open_security_group}, key_name: {get_resource: storperf_key_pair}, - volume_size: {get_param: volume_size} + volume_count: {get_param: volume_count}, + volume_size: {get_param: volume_size}, + volume_type: {get_param: volume_type} } } storperf_network: type: OS::Neutron::Net - properties: - name: storperf-network storperf_subnet: type: OS::Neutron::Subnet properties: network_id: { get_resource: storperf_network } - cidr: 172.16.0.0/16 - gateway_ip: 172.16.0.1 + cidr: { get_param: subnet_CIDR} storperf_network_router: type: OS::Neutron::Router @@ -86,7 +100,7 @@ resources: type: OS::Nova::KeyPair properties: save_private_key: true - name: storperf_agent_keypair + name: { get_param: keypair_name} storperf_open_security_group: type: OS::Neutron::SecurityGroup |