Revert "Forbid Sahara and Murano deployment on environments with QEMU hypervisor"
This reverts commit 7ae239c86b
.
Change-Id: Ic0ad0b0952a7018cf8cb94070e706161571feeea
This commit is contained in:
parent
dee4e31d03
commit
bb362555db
|
@ -696,8 +696,6 @@
|
|||
description: "If selected, Sahara component will be installed"
|
||||
weight: 10
|
||||
type: "checkbox"
|
||||
restrictions:
|
||||
- "settings:common.libvirt_type.value == 'qemu'": "Sahara requires KVM as a hypervisor."
|
||||
murano:
|
||||
value: false
|
||||
label: "Install Murano"
|
||||
|
@ -706,7 +704,6 @@
|
|||
type: "checkbox"
|
||||
restrictions:
|
||||
- "cluster:net_provider != 'neutron'"
|
||||
- "settings:common.libvirt_type.value == 'qemu'": "Murano requires KVM as a hypervisor."
|
||||
heat:
|
||||
value: true
|
||||
label: ""
|
||||
|
@ -1219,8 +1216,6 @@
|
|||
description: "dialog.create_cluster_wizard.additional.install_sahara_description"
|
||||
bind: "settings:additional_components.sahara.value"
|
||||
weight: 10
|
||||
restrictions:
|
||||
- "Compute.hypervisor == 'qemu'": "dialog.create_cluster_wizard.additional.qemu_alert"
|
||||
murano:
|
||||
type: "checkbox"
|
||||
label: "dialog.create_cluster_wizard.additional.install_murano"
|
||||
|
@ -1229,7 +1224,6 @@
|
|||
weight: 20
|
||||
restrictions:
|
||||
- "Network.manager == 'nova-network'": "dialog.create_cluster_wizard.additional.network_mode_alert"
|
||||
- "Compute.hypervisor == 'qemu'": "dialog.create_cluster_wizard.additional.qemu_alert"
|
||||
ceilometer:
|
||||
type: "checkbox"
|
||||
label: "dialog.create_cluster_wizard.additional.install_ceilometer"
|
||||
|
|
|
@ -2240,9 +2240,8 @@ button, .btn:not(.btn-link) {.font-semibold;}
|
|||
width: 830px;
|
||||
height: 485px;
|
||||
.modal-body {
|
||||
@wizard-body-height: 305px;
|
||||
@wizard-body-padding: 15px;
|
||||
height: @wizard-body-height;
|
||||
height: 305px;
|
||||
}
|
||||
.wizard-steps-nav {
|
||||
padding-left: 0;
|
||||
li {
|
||||
|
@ -2256,11 +2255,6 @@ button, .btn:not(.btn-link) {.font-semibold;}
|
|||
}
|
||||
}
|
||||
}
|
||||
.pane-content {
|
||||
max-height: @wizard-body-height - @wizard-body-padding;
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
.release-alert {
|
||||
margin: 10px 0;
|
||||
|
|
|
@ -726,7 +726,6 @@
|
|||
"title": "Additional Services",
|
||||
"release_alert": "Additional services are not available in __NameAndRelease.release_name__",
|
||||
"network_mode_alert": "Murano requires Neutron as a network option.",
|
||||
"qemu_alert": "Sahara and Murano require KVM as a hypervisor.",
|
||||
"install_sahara": "Install Sahara",
|
||||
"install_sahara_description": "Sahara enables on demand provisioning of Hadoop clusters to be deployed on OpenStack utilizing a variety of vendor distributions.",
|
||||
"install_murano": "Install Murano",
|
||||
|
|
|
@ -26,17 +26,15 @@ casper.then(function() {
|
|||
|
||||
casper.then(function() {
|
||||
this.test.comment('Testing cluster OpenStack settings: Save button interractions');
|
||||
this.click('input[type=checkbox]:not(:disabled)');
|
||||
this.test.assertSelectorAppears('.btn-apply-changes:not(:disabled)', 'Save settings button is enabled if there are changes');
|
||||
this.then(function() {
|
||||
this.click('input[type=checkbox]:not(:disabled)');
|
||||
this.click('input[type=checkbox]');
|
||||
this.test.assertExists('.btn-apply-changes:not(:disabled)', 'Save settings button is enabled if there are changes');
|
||||
this.click('input[type=checkbox]');
|
||||
this.test.assertSelectorAppears('.btn-apply-changes:disabled', 'Save settings button is disabled again if there are no changes');
|
||||
});
|
||||
});
|
||||
|
||||
casper.then(function() {
|
||||
this.test.comment('Testing cluster OpenStack settings: cancel changes operation');
|
||||
this.click('input[type=checkbox]:not(:disabled)');
|
||||
this.click('input[type=checkbox]');
|
||||
this.click('.cluster-tab.active + .cluster-tab');
|
||||
this.test.assertSelectorAppears('.dismiss-settings-dialog', 'Dismiss changes dialog appears if there are changes and user is going to leave the tab');
|
||||
this.then(function() {
|
||||
|
@ -51,7 +49,7 @@ casper.then(function() {
|
|||
|
||||
casper.then(function() {
|
||||
this.test.comment('Testing OpenStack settings: save changes');
|
||||
this.click('input[type=checkbox]:not(:disabled)');
|
||||
this.click('input[type=checkbox]');
|
||||
this.test.assertExists('.btn-apply-changes:not(:disabled)', 'Save settings button is enabled');
|
||||
this.click('.btn-apply-changes:not(:disabled)');
|
||||
this.waitWhileSelector('.btn-load-defaults:disabled');
|
||||
|
|
Loading…
Reference in New Issue