diff --git a/deploy-board/deploy_board/settings.py b/deploy-board/deploy_board/settings.py index bcfcc3b89e..2dcf6d1768 100644 --- a/deploy-board/deploy_board/settings.py +++ b/deploy-board/deploy_board/settings.py @@ -298,6 +298,7 @@ TELETRAAN_DISABLE_CREATE_ENV_PAGE = True if os.getenv("TELETRAAN_DISABLE_CREATE_ENV_PAGE", "false") == "true" else False +TELETRAAN_DISABLE_BACKUP_INSTANCE_TYPES = True if os.getenv("TELETRAAN_DISABLE_BACKUP_INSTANCE_TYPES", "false") == "true" else False TELETRAAN_REDIRECT_CREATE_ENV_PAGE_URL = os.getenv("TELETRAAN_REDIRECT_CREATE_ENV_PAGE_URL", None) TELETRAAN_CLUSTER_READONLY_FIELDS = os.getenv("TELETRAAN_CLUSTER_READONLY_FIELDS", "spiffe_id").split(",") IS_DURING_CODE_FREEZE = True if os.getenv("TELETRAAN_CODE_FREEZE", "false") == "true" else False diff --git a/deploy-board/deploy_board/static/js/components/clusterconfigcomponents.js b/deploy-board/deploy_board/static/js/components/clusterconfigcomponents.js index a165b9354d..5668d00a0f 100644 --- a/deploy-board/deploy_board/static/js/components/clusterconfigcomponents.js +++ b/deploy-board/deploy_board/static/js/components/clusterconfigcomponents.js @@ -534,11 +534,16 @@ Vue.component("hosttype-select", { \ \
\ -
\ +
\ \ \
', - props: ['label', 'title', 'selectoptions', 'showhelp', 'small', 'selectsearch', 'retired', 'enablemultiplehosttypes'], + props: ['label', 'title', 'selectoptions', 'showhelp', 'small', 'selectsearch', 'retired', 'enablemultiplehosttypes', 'disablebackupinstancetypes'], + computed: { + isVisible: function () { + return this.disablebackupinstancetypes === "False" + } + }, data: function () { return { width: this.small ? 'col-xs-4' : 'col-xs-10', diff --git a/deploy-board/deploy_board/templates/clusters/cluster_configuration.html b/deploy-board/deploy_board/templates/clusters/cluster_configuration.html index ca6829a854..eaf2c23335 100644 --- a/deploy-board/deploy_board/templates/clusters/cluster_configuration.html +++ b/deploy-board/deploy_board/templates/clusters/cluster_configuration.html @@ -75,7 +75,7 @@

Capacity

@base-image-change="baseImageChange" @image-name-change="imageNameChange" @help-clicked="baseImageHelpClick" > - @@ -447,6 +447,7 @@

Capacity

const hieraPaths = `{{ puppet_hiera_paths }}`; const puppetRepository = `{{ puppet_repository }}`; const deployServiceWikiUrl = `{{ conflicting_deploy_service_wiki_url }}`; + const disableBackupInstanceTypes = `{{ disable_backup_instance_types}}`; var capacitySetting = new Vue({ el: "#mainPanel", @@ -556,6 +557,7 @@

Capacity

puppetRepository, hieraPaths, deployServiceWikiUrl, + disableBackupInstanceTypes, }), methods: { addConfig: function(config) { diff --git a/deploy-board/deploy_board/webapp/cluster_view.py b/deploy-board/deploy_board/webapp/cluster_view.py index e4ea472c1a..df01bcf79b 100644 --- a/deploy-board/deploy_board/webapp/cluster_view.py +++ b/deploy-board/deploy_board/webapp/cluster_view.py @@ -20,7 +20,7 @@ from django.contrib.messages import get_messages from django.views.generic import View -from deploy_board.settings import IS_PINTEREST, RODIMUS_CLUSTER_REPLACEMENT_WIKI_URL, RODIMUS_AUTO_CLUSTER_REFRESH_WIKI_URL +from deploy_board.settings import IS_PINTEREST, RODIMUS_CLUSTER_REPLACEMENT_WIKI_URL, RODIMUS_AUTO_CLUSTER_REFRESH_WIKI_URL, TELETRAAN_DISABLE_BACKUP_INSTANCE_TYPES if IS_PINTEREST: from deploy_board.settings import DEFAULT_PROVIDER, DEFAULT_CMP_IMAGE, DEFAULT_CMP_ARM_IMAGE, \ DEFAULT_CMP_HOST_TYPE, DEFAULT_CMP_ARM_HOST_TYPE, DEFAULT_CMP_PINFO_ENVIRON, DEFAULT_CMP_ACCESS_ROLE, DEFAULT_CELL, DEFAULT_ARCH, \ @@ -83,6 +83,7 @@ def get(self, request, name, stage): 'default_cmp_arm_image': DEFAULT_CMP_ARM_IMAGE, 'default_host_type': DEFAULT_CMP_HOST_TYPE, 'default_arm_host_type': DEFAULT_CMP_ARM_HOST_TYPE, + 'disable_backup_instance_types': TELETRAAN_DISABLE_BACKUP_INSTANCE_TYPES, 'capacity_creation_info': json.dumps(capacity_creation_info)}) def post(self, request, name, stage): @@ -192,7 +193,8 @@ def get(self, request, name, stage): 'is_pinterest': IS_PINTEREST, 'puppet_repository': PUPPET_CONFIG_REPOSITORY, 'puppet_hiera_paths': PUPPET_HIERA_PATHS, - 'conflicting_deploy_service_wiki_url': CONFLICTING_DEPLOY_SERVICE_WIKI_URL + 'conflicting_deploy_service_wiki_url': CONFLICTING_DEPLOY_SERVICE_WIKI_URL, + 'disable_backup_instance_types': TELETRAAN_DISABLE_BACKUP_INSTANCE_TYPES }) def post(self, request, name, stage): @@ -306,7 +308,8 @@ def get(self, request, name, stage): 'is_pinterest': IS_PINTEREST, 'puppet_repository': PUPPET_CONFIG_REPOSITORY, 'puppet_hiera_paths': PUPPET_HIERA_PATHS, - 'conflicting_deploy_service_wiki_url': CONFLICTING_DEPLOY_SERVICE_WIKI_URL + 'conflicting_deploy_service_wiki_url': CONFLICTING_DEPLOY_SERVICE_WIKI_URL, + 'disable_backup_instance_types': TELETRAAN_DISABLE_BACKUP_INSTANCE_TYPES }) def post(self, request, name, stage):