| Index: trunk/extensions/OpenStackManager/special/SpecialNovaDomain.php |
| — | — | @@ -64,6 +64,7 @@ |
| 65 | 65 | 'label-message' => 'openstackmanager-location', |
| 66 | 66 | 'default' => '', |
| 67 | 67 | 'section' => 'domain/info', |
| | 68 | + 'help-message' => 'openstackmanager-location-help', |
| 68 | 69 | ); |
| 69 | 70 | $domainInfo['action'] = array( |
| 70 | 71 | 'type' => 'hidden', |
| Index: trunk/extensions/OpenStackManager/OpenStackManager.i18n.php |
| — | — | @@ -60,6 +60,7 @@ |
| 61 | 61 | 'openstackmanager-domainname' => 'Domain Name', |
| 62 | 62 | 'openstackmanager-fqdn' => 'Fully Qualified Domain Name', |
| 63 | 63 | 'openstackmanager-location' => 'Location', |
| | 64 | + 'openstackmanager-location-help' => 'Location field is for private DNS zones. Leave blank for public zones.', |
| 64 | 65 | |
| 65 | 66 | 'openstackmanager-novainstance-instance' => 'Instance', |
| 66 | 67 | 'openstackmanager-configureinstance' => 'Configure Instance', |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaDomain.php |
| — | — | @@ -181,7 +181,9 @@ |
| 182 | 182 | $domain['dc'] = $domainname; |
| 183 | 183 | $domain['soarecord'] = $wgOpenStackManagerDNSOptions['servers']['primary'] . ' ' . $soa; |
| 184 | 184 | $domain['associateddomain'] = $fqdn; |
| 185 | | - $domain['l'] = $location; |
| | 185 | + if ( $location ) { |
| | 186 | + $domain['l'] = $location; |
| | 187 | + } |
| 186 | 188 | $dn = 'dc=' . $domainname . ',' . $wgOpenStackManagerLDAPInstanceBaseDN; |
| 187 | 189 | |
| 188 | 190 | wfSuppressWarnings(); |