diff options
Diffstat (limited to 'docker/storperf-master/storperf/resources')
| -rw-r--r-- | docker/storperf-master/storperf/resources/hot/agent-group.yaml | 5 | ||||
| -rw-r--r-- | docker/storperf-master/storperf/resources/hot/storperf-agent.yaml | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/docker/storperf-master/storperf/resources/hot/agent-group.yaml b/docker/storperf-master/storperf/resources/hot/agent-group.yaml index c758ecd..3c02e31 100644 --- a/docker/storperf-master/storperf/resources/hot/agent-group.yaml +++ b/docker/storperf-master/storperf/resources/hot/agent-group.yaml @@ -33,7 +33,9 @@ parameters: constraints: - range: { min: 1, max: 512 } description: must be between 1 and 512 agents. - + availability_zone: + type: string + default: nova resources: slaves: @@ -49,6 +51,7 @@ resources: agent_network: {get_resource: storperf_network}, flavor: {get_param: agent_flavor}, image: {get_param: agent_image}, + 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} diff --git a/docker/storperf-master/storperf/resources/hot/storperf-agent.yaml b/docker/storperf-master/storperf/resources/hot/storperf-agent.yaml index 9f0481e..7841e8c 100644 --- a/docker/storperf-master/storperf/resources/hot/storperf-agent.yaml +++ b/docker/storperf-master/storperf/resources/hot/storperf-agent.yaml @@ -39,11 +39,11 @@ parameters: type: string constraints: - custom_constraint: neutron.network - agent_zone: + availability_zone: type: string default: nova -resources: +resources: storperf_agent: type: "OS::Nova::Server" properties: @@ -55,7 +55,7 @@ resources: - port: { get_resource: storperf_agent_port } user_data: { get_resource: storperf_agent_config } user_data_format: RAW - availability_zone: { get_param: agent_zone} + availability_zone: { get_param: availability_zone} storperf_agent_config: type: "OS::Heat::CloudConfig" |