Skip to content
This repository has been archived by the owner on Oct 3, 2023. It is now read-only.

Sync dcos-launch with latest acs-engine updates #132

Merged
merged 1 commit into from
May 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions dcos_launch/acs_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,18 +178,9 @@ def create(self):
if windows_image_source_url:
acs_engine_template["properties"]["windowsProfile"]["WindowsImageSourceUrl"] = windows_image_source_url
linux_bs_url = self.config.get('dcos_linux_bootstrap_url')
linux_repository_url = self.config.get('dcos_linux_repository_url')
linux_cluster_package_list_id = self.config.get('dcos_linux_cluster_package_list_id')
provider_package_id = self.config.get('provider_package_id')
arm_template, self.config['template_parameters'] = run_acs_engine(self.config['acs_engine_tarball_url'], acs_engine_template) # noqa
if linux_bs_url:
self.config['template_parameters']['dcosBootstrapURL'] = linux_bs_url
if linux_repository_url:
self.config['template_parameters']['dcosRepositoryURL'] = linux_repository_url
if linux_cluster_package_list_id:
self.config['template_parameters']['dcosClusterPackageListID'] = linux_cluster_package_list_id
if provider_package_id:
self.config['template_parameters']['dcosProviderPackageID'] = provider_package_id
self.azure_wrapper.deploy_template_to_new_resource_group(
self.config.get('template_url'),
self.config['deployment_name'],
Expand Down
9 changes: 0 additions & 9 deletions dcos_launch/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -540,15 +540,6 @@ def get_platform_dependent_url(url_to_format: str, error_msg: str) -> str:
'windows_image_source_url': {
'type': 'string',
'required': False},
'dcos_linux_repository_url': {
'type': 'string',
'required': False},
'dcos_linux_cluster_package_list_id': {
'type': 'string',
'required': False},
'provider_package_id': {
'type': 'string',
'required': False},
'ssh_user': {
'type': 'string',
'required': True,
Expand Down