| Index: trunk/extensions/OpenStackManager/OpenStackNovaController.php |
| — | — | @@ -6,12 +6,12 @@ |
| 7 | 7 | var $novaConnection; |
| 8 | 8 | var $instances, $images, $keypairs, $availabilityZones; |
| 9 | 9 | |
| 10 | | - var $instanceTypes = Array( 't1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'c1.medium', 'c1.xlarge', 'cc1.4xlarge' ); |
| | 10 | + var $instanceTypes = array( 't1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'c1.medium', 'c1.xlarge', 'cc1.4xlarge' ); |
| 11 | 11 | |
| 12 | 12 | # TODO: Make disable_ssl, hostname, and resource_prefix config options |
| 13 | 13 | function __construct( $credentials ) { |
| 14 | 14 | global $wgOpenStackManagerNovaDisableSSL, $wgOpenStackManagerNovaServerName, |
| 15 | | - $wgOpenStackManagerNovaPort, $wgOpenStackManagerNovaResourcePrefix; |
| | 15 | + $wgOpenStackManagerNovaPort, $wgOpenStackManagerNovaResourcePrefix; |
| 16 | 16 | wfLoadExtensionMessages('OpenStackManager'); |
| 17 | 17 | $this->novaConnection = new AmazonEC2( $credentials['accessKey'], $credentials['secretKey'] ); |
| 18 | 18 | $this->novaConnection->disable_ssl($wgOpenStackManagerNovaDisableSSL); |