Skip to content

Commit

Permalink
Sync dcos-launch with latest acs-engine updates
Browse files Browse the repository at this point in the history
Since the bootstrap node support in acs-engine (Azure/acs-engine#2825),
these parameters are not needed anymore.
  • Loading branch information
Ionut Balutoiu committed May 4, 2018
1 parent 3b44111 commit 57d578a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
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 @@ -535,15 +535,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

0 comments on commit 57d578a

Please sign in to comment.