Consistent naming - part 2 - longer model name
sticking with "active_directory" for clarity.
This commit is contained in:
parent
2057dcd64a
commit
7062e6ad3b
|
@ -461,7 +461,7 @@
|
||||||
"additionalProperties": false
|
"additionalProperties": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ad": {
|
"active_directory": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"admin_name": {
|
"admin_name": {
|
||||||
|
|
|
@ -29,7 +29,7 @@ apt:
|
||||||
- {package: "python-*", pin: "origin *ubuntu.com*", pin-priority: -1}
|
- {package: "python-*", pin: "origin *ubuntu.com*", pin-priority: -1}
|
||||||
keyboard:
|
keyboard:
|
||||||
layout: gb
|
layout: gb
|
||||||
ad:
|
active_directory:
|
||||||
admin_name: '$ubuntu'
|
admin_name: '$ubuntu'
|
||||||
domain_name: 'ad.ubuntu.com'
|
domain_name: 'ad.ubuntu.com'
|
||||||
identity:
|
identity:
|
||||||
|
|
|
@ -180,7 +180,7 @@ class SubiquityModel:
|
||||||
self.target = root
|
self.target = root
|
||||||
self.chroot_prefix = []
|
self.chroot_prefix = []
|
||||||
|
|
||||||
self.ad = AdModel()
|
self.active_directory = AdModel()
|
||||||
self.codecs = CodecsModel()
|
self.codecs = CodecsModel()
|
||||||
self.debconf_selections = DebconfSelectionsModel()
|
self.debconf_selections = DebconfSelectionsModel()
|
||||||
self.drivers = DriversModel()
|
self.drivers = DriversModel()
|
||||||
|
|
|
@ -93,7 +93,7 @@ class AdController(SubiquityController):
|
||||||
""" Implements the server part of the Active Directory feature. """
|
""" Implements the server part of the Active Directory feature. """
|
||||||
endpoint = API.active_directory
|
endpoint = API.active_directory
|
||||||
# No auto install key and schema for now due password handling uncertainty.
|
# No auto install key and schema for now due password handling uncertainty.
|
||||||
autoinstall_key = model_name = "ad"
|
autoinstall_key = model_name = "active_directory"
|
||||||
autoinstall_schema = {
|
autoinstall_schema = {
|
||||||
'type': 'object',
|
'type': 'object',
|
||||||
'properties': {
|
'properties': {
|
||||||
|
|
|
@ -406,7 +406,7 @@ class InstallController(SubiquityController):
|
||||||
policy = self.model.updates.updates
|
policy = self.model.updates.updates
|
||||||
await self.run_unattended_upgrades(context=context, policy=policy)
|
await self.run_unattended_upgrades(context=context, policy=policy)
|
||||||
await self.restore_apt_config(context=context)
|
await self.restore_apt_config(context=context)
|
||||||
if self.model.ad.do_join:
|
if self.model.active_directory.do_join:
|
||||||
hostname = self.model.identity.hostname
|
hostname = self.model.identity.hostname
|
||||||
if not hostname:
|
if not hostname:
|
||||||
with open(self.tpath('etc/hostname'), 'r') as f:
|
with open(self.tpath('etc/hostname'), 'r') as f:
|
||||||
|
|
|
@ -215,7 +215,7 @@ POSTINSTALL_MODEL_NAMES = ModelNames({
|
||||||
"ubuntu_pro",
|
"ubuntu_pro",
|
||||||
"userdata",
|
"userdata",
|
||||||
},
|
},
|
||||||
desktop={"timezone", "codecs", "ad"})
|
desktop={"timezone", "codecs", "active_directory"})
|
||||||
|
|
||||||
|
|
||||||
class SubiquityServer(Application):
|
class SubiquityServer(Application):
|
||||||
|
|
Loading…
Reference in New Issue