| Index: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php |
| — | — | @@ -297,6 +297,13 @@ |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | function setPuppetInfo( &$instanceInfo, $puppetinfo=array() ) { |
| | 301 | + if ( !$puppetinfo ) { |
| | 302 | + $instanceInfo["warning"] = array( |
| | 303 | + 'type' => 'info', |
| | 304 | + 'section' => "instance/puppetinfo", |
| | 305 | + 'default' => wfMsg( 'openstackmanager-createinstancepuppetwarning' ), |
| | 306 | + ); |
| | 307 | + } |
| 301 | 308 | $puppetGroups = OpenStackNovaPuppetGroup::getGroupList(); |
| 302 | 309 | foreach ( $puppetGroups as $puppetGroup ) { |
| 303 | 310 | $classes = array(); |
| Index: trunk/extensions/OpenStackManager/OpenStackManager.i18n.php |
| — | — | @@ -100,6 +100,7 @@ |
| 101 | 101 | |
| 102 | 102 | 'openstackmanager-launchtime' => 'Launch time', |
| 103 | 103 | 'openstackmanager-createinstance' => 'Create a new instance', |
| | 104 | + 'openstackmanager-createinstancepuppetwarning' => 'Warning: Adding puppet configuration on instance creation can cause the instance to fail to build. Use this configuration with caution. You will have an opportunity to configure the instance after it is finished building.', |
| 104 | 105 | 'openstackmanager-invaliddomain' => 'Requested domain is invalid.', |
| 105 | 106 | 'openstackmanager-createdinstance' => 'Created instance $1 with image $2 and hostname $3.', |
| 106 | 107 | 'openstackmanager-createfailedldap' => 'Failed to create instance as the host could not be added to LDAP.', |