Skip to content
Snippets Groups Projects
Commit ab659eb8 authored by yas's avatar yas
Browse files

Added the description for Canada (Central), EU (Frankfurt), EU (London) and Asia Pacific (Seoul)

parent 31357a85
No related branches found
Tags 8.x-2.0-alpha9
No related merge requests found
......@@ -8,6 +8,7 @@
*
*/
// Updated by yas 2017/06/13
// Updated by yas 2016/10/21
// Updated by yas 2015/06/15
// Updated by yas 2015/05/08
......@@ -183,7 +184,7 @@ function aws_cloud_add_form($form, $form_state, $edit = array(), $op = '') {
$form['cloud']['cloud_name'] = array(
'#type' => 'textfield',
'#title' => t('Cloud Name'),
'#description' => t('Cloud name as an identifier: e.g. amazon_ec2_us_east_1 | amazon_ec2_us_east_2 | amazon_ec2_us_west_1 | amazon_ec2_us_west_2 | amazon_ca_central_1 | amazon_ec2_eu_west_1 | amazon_ec2_eu_central_1 | amazon_ec2_eu_west_2 | amazon_ec2_ap_northeast_1 | amazon_ec2_ap_northeast_2 | amazon_ec2_ap_southeast_1 | amazon_ec2_ap_southeast_2 | openstack_nova - The Cloud Name must contain only lowercase letters, numbers, and underscores. Space cannot be included.'),
'#description' => t('Cloud name as an identifier: e.g. amazon_ec2_us_east_1 | amazon_ec2_us_east_2 | amazon_ec2_us_west_1 | amazon_ec2_us_west_2 | amazon_ca_central_1 | amazon_ec2_eu_west_1 | amazon_ec2_eu_central_1 | amazon_ec2_eu_west_2 | amazon_ec2_ap_south_1 | amazon_ec2_ap_northeast_1 | amazon_ec2_ap_northeast_2 | amazon_ec2_ap_southeast_1 | amazon_ec2_ap_southeast_2 | openstack_nova - The Cloud Name must contain only lowercase letters, numbers, and underscores. Space cannot be included.'),
'#required' => TRUE,
'#default_value' => $edit['cloud_name'],
);
......@@ -193,7 +194,7 @@ function aws_cloud_add_form($form, $form_state, $edit = array(), $op = '') {
'#title' => t('Cloud Display Name'),
'#type' => 'textfield',
'#title' => t('Cloud Display Name'),
'#description' => t('e.g. US East (N. Virginia) (or AWS Virgina) | US East (Ohio) (or AWS Ohio) | US West (Northern California) (or AWS California) | US West (Oregon) (or AWS Oregon) | Canada (Central) (or AWS Canada) | EU (Ireland) (or AWS Ireland) | EU (Frankfurt) (or AWS Frankfurt) | EU (London) (or AWS London) | Asia Pacific (Tokyo) (or AWS Tokyo) | Asia Pacific (Seoul) (or AWS Seoul) | Asia Pacific (Singapore) (or AWS Singapore) | Asia Pacific (Sydney) (or AWS Sydney) | Asia Pacific (Mumbai) (or AWS Mumbai) | South America (São Paulo) (or AWS São Paulo) | OpenStack | Eucalyptus'),
'#description' => t('e.g. US East (N. Virginia) (or AWS Virgina) | US East (Ohio) (or AWS Ohio) | US West (Northern California) (or AWS California) | US West (Oregon) (or AWS Oregon) | Canada (Central) (or AWS Canada) | EU (Ireland) (or AWS Ireland) | EU (Frankfurt) (or AWS Frankfurt) | EU (London) (or AWS London) | Asia Pacific (Mumbai) (or AWS Mumbai) | Asia Pacific (Tokyo) (or AWS Tokyo) | Asia Pacific (Seoul) (or AWS Seoul) | Asia Pacific (Singapore) (or AWS Singapore) | Asia Pacific (Sydney) (or AWS Sydney) | South America (São Paulo) (or AWS São Paulo) | OpenStack | Eucalyptus'),
'#required' => TRUE,
'#default_value' => $edit['cloud_display_name'],
);
......@@ -210,7 +211,7 @@ function aws_cloud_add_form($form, $form_state, $edit = array(), $op = '') {
$form['cloud']['host_uri'] = array(
'#type' => 'textfield',
'#title' => t('API URI'),
'#description' => t("'http://' is NOT required: e.g. ec2.amazonaws.com | ec2.us-east-2.amazonaws.com | ec2.us-west-1.amazonaws.com | ec2.us-west-2.amazonaws.com | ec2.eu-west-1.amazonaws.com | ec2.ap-northeast-1.amazonaws.com | ec2.ap-southeast-1.amazonaws.com | ec2.ap-southeast-2.amazonaws.com | ec2.ap-south-1.amazonaws.com | ec2.sa-east-1.amazonaws.com | OpenStack: 192.168.0.1:8773/services/Cloud | Cloud(n) JP: comp-apia.jp-e1.cloudn-service.com/awsapi | Cloud(n) US: comp-apia.us-e1.cloudn-service.com/awsapi"),
'#description' => t("'http://' is NOT required: e.g. ec2.amazonaws.com | ec2.us-east-2.amazonaws.com | ec2.us-west-1.amazonaws.com | ec2.us-west-2.amazonaws.com | ec2.ca-central-1.amazonaws.com | ec2.eu-west-1.amazonaws.com | ec2.eu-central-1.amazonaws.com | ec2.eu-west-2.amazonaws.com | ec2.ap-south-1.amazonaws.com | ec2.ap-northeast-1.amazonaws.com | ec2.ap-southeast-1.amazonaws.com | ec2.ap-southeast-2.amazonaws.com | ec2.sa-east-1.amazonaws.com | OpenStack: 192.168.0.1:8773/services/Cloud | Cloud(n) JP: comp-apia.jp-e1.cloudn-service.com/awsapi | Cloud(n) US: comp-apia.us-e1.cloudn-service.com/awsapi"),
'#size' => 50,
'#maxlength' => 255,
'#required' => TRUE,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment