| Index: trunk/extensions/OpenStackManager/OpenStackNovaImage.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | * @return string |
| 29 | 29 | */ |
| 30 | 30 | function getImageId() { |
| 31 | | - return (string)$this->image->id; |
| | 31 | + return (string)$this->image->imageId; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | /** |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaController.php |
| — | — | @@ -384,6 +384,7 @@ |
| 385 | 385 | # recommended method of adding security group rules. When lp704645 is fixed, switch |
| 386 | 386 | # to using this method. |
| 387 | 387 | $rule = array(); |
| | 388 | + $rule['GroupName'] = $groupname; |
| 388 | 389 | if ( $fromport ) { |
| 389 | 390 | $rule['FromPort'] = $fromport; |
| 390 | 391 | } |
| — | — | @@ -407,8 +408,8 @@ |
| 408 | 409 | } |
| 409 | 410 | } |
| 410 | 411 | #$permissions = array( 'IpPermissions' => array( $rule ) ); |
| 411 | | - #$response = $this->novaConnection->authorize_security_group_ingress( $groupname, $permissions ); |
| 412 | | - $response = $this->novaConnection->authorize_security_group_ingress( $groupname, $rule ); |
| | 412 | + #$response = $this->novaConnection->authorize_security_group_ingress( $permissions ); |
| | 413 | + $response = $this->novaConnection->authorize_security_group_ingress( $rule ); |
| 413 | 414 | |
| 414 | 415 | return $response->isOK(); |
| 415 | 416 | } |
| — | — | @@ -427,6 +428,7 @@ |
| 428 | 429 | # recommended method of removing security group rules. When lp704645 is fixed, switch |
| 429 | 430 | # to using this method. |
| 430 | 431 | $rule = array(); |
| | 432 | + $rule['GroupName'] = $groupname; |
| 431 | 433 | if ( $fromport ) { |
| 432 | 434 | $rule['FromPort'] = $fromport; |
| 433 | 435 | } |
| — | — | @@ -450,8 +452,8 @@ |
| 451 | 453 | } |
| 452 | 454 | } |
| 453 | 455 | #$permissions = array( 'IpPermissions' => array( $rule ) ); |
| 454 | | - #$response = $this->novaConnection->revoke_security_group_ingress( $groupname, $permissions ); |
| 455 | | - $response = $this->novaConnection->revoke_security_group_ingress( $groupname, $rule ); |
| | 456 | + #$response = $this->novaConnection->revoke_security_group_ingress( $permissions ); |
| | 457 | + $response = $this->novaConnection->revoke_security_group_ingress( $rule ); |
| 456 | 458 | return $response->isOK(); |
| 457 | 459 | } |
| 458 | 460 | |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php |
| — | — | @@ -589,7 +589,7 @@ |
| 590 | 590 | } |
| 591 | 591 | # TODO: also add puppet |
| 592 | 592 | } else { |
| 593 | | - $wgOut->addWikiMsg( 'openstackmanager-createeinstancefailed' ); |
| | 593 | + $wgOut->addWikiMsg( 'openstackmanager-createinstancefailed' ); |
| 594 | 594 | } |
| 595 | 595 | $sk = $wgOut->getSkin(); |
| 596 | 596 | $out = '<br />'; |