| Index: trunk/extensions/OpenStackManager/OpenStackNovaHost.php |
| — | — | @@ -202,7 +202,7 @@ |
| 203 | 203 | foreach ( $oldpuppetinfo['puppetvar'] as $variable => $value ) { |
| 204 | 204 | $wgAuth->printDebug( "Found $variable", NONSENSITIVE ); |
| 205 | 205 | if ( $variable == "instancecreator_email" || $variable == "instancecreator_username" |
| 206 | | - || $variable == "instancecreator_lang" || $variable == "instanceproject" ) { |
| | 206 | + || $variable == "instancecreator_lang" || $variable == "instanceproject" || $variable == "instancename" ) { |
| 207 | 207 | $hostEntry['puppetvar'][] = $variable . '=' . $value; |
| 208 | 208 | } |
| 209 | 209 | } |
| — | — | @@ -669,6 +669,7 @@ |
| 670 | 670 | $hostEntry['puppetvar'][] = 'instancecreator_username=' . $wgUser->getName(); |
| 671 | 671 | $hostEntry['puppetvar'][] = 'instancecreator_lang=' . $wgLang->getCode(); |
| 672 | 672 | $hostEntry['puppetvar'][] = 'instanceproject=' . $project; |
| | 673 | + $hostEntry['puppetvar'][] = 'instancename=' . $hostname; |
| 673 | 674 | } |
| 674 | 675 | $dn = 'dc=' . $instanceid . ',dc=' . $domain->getDomainName() . ',' . $wgOpenStackManagerLDAPInstanceBaseDN; |
| 675 | 676 | |