summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Aranovich <jkirnosova@mirantis.com>2017-02-28 15:10:40 +0400
committerJulia Aranovich <jkirnosova@mirantis.com>2017-03-01 09:24:14 +0000
commitc0384fac05b78ed9edf198f34aa4a49516218f34 (patch)
treecc3aa9eb298872c51f7a0f4343e9c0eae76fea2a
parentd72287f19e533b8f6bf4c5e6abdee9612bf4ea64 (diff)
Make Ceilometer and MongoDB experimental features
Since Fuel 10, Ceilometer and MongoDB services become experimental features. * Ceilometer and MongoDB settings are shown on Settings tab in Fuel UI only if "experimental" feature group is enabled * MongoDB role is available if "experimental" feature group is enabled only * Ceilometer option is removed from the cluster creation wizard Implements: blueprint remove-ceilometer Change-Id: I6df3b47c14cafb1544dfe034cd9a2c0ad14205be
Notes
Notes (review): Code-Review+1: Georgy Kibardin <gkibardin@mirantis.com> Code-Review+2: Aleksey Kasatkin <akasatkin@mirantis.com> Code-Review+2: Alexander Kislitsky <akislitsky@mirantis.com> Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Workflow+1: Alexander Kislitsky <akislitsky@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 02 Mar 2017 08:54:15 +0000 Reviewed-on: https://review.openstack.org/438925 Project: openstack/fuel-web Branch: refs/heads/master
-rw-r--r--nailgun/nailgun/fixtures/openstack.yaml27
1 files changed, 7 insertions, 20 deletions
diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
index e3f624f..4fd9efe 100644
--- a/nailgun/nailgun/fixtures/openstack.yaml
+++ b/nailgun/nailgun/fixtures/openstack.yaml
@@ -112,6 +112,8 @@
112 message: "Ceilometer should be enabled in the environment settings." 112 message: "Ceilometer should be enabled in the environment settings."
113 - condition: "settings:additional_components.mongo.value == true" 113 - condition: "settings:additional_components.mongo.value == true"
114 message: "You are already using external MongoDB." 114 message: "You are already using external MongoDB."
115 - condition: "not ('experimental' in version:feature_groups)"
116 action: "hide"
115 tags: 117 tags:
116 - mongo 118 - mongo
117 base-os: 119 base-os:
@@ -989,6 +991,9 @@
989 description: "If selected, Ceilometer and Aodh components will be installed" 991 description: "If selected, Ceilometer and Aodh components will be installed"
990 weight: 60 992 weight: 60
991 type: "checkbox" 993 type: "checkbox"
994 restrictions:
995 - condition: "not ('experimental' in version:feature_groups)"
996 action: "hide"
992 mongo: 997 mongo:
993 value: false 998 value: false
994 label: "Use external Mongo DB" 999 label: "Use external Mongo DB"
@@ -996,6 +1001,8 @@
996 weight: 70 1001 weight: 70
997 type: "checkbox" 1002 type: "checkbox"
998 restrictions: 1003 restrictions:
1004 - condition: "not ('experimental' in version:feature_groups)"
1005 action: "hide"
999 - "settings:additional_components.ceilometer.value == false": "External Mongo aims to be an external backend for Ceilometer. Without Ceilometer enabled, External Mongo is useless and should not be installed." 1006 - "settings:additional_components.ceilometer.value == false": "External Mongo aims to be an external backend for Ceilometer. Without Ceilometer enabled, External Mongo is useless and should not be installed."
1000 ironic: 1007 ironic:
1001 value: false 1008 value: false
@@ -1774,25 +1781,6 @@
1774 - name: storage:ephemeral:ceph 1781 - name: storage:ephemeral:ceph
1775 - name: storage:image:ceph 1782 - name: storage:image:ceph
1776 - name: additional_service:sahara 1783 - name: additional_service:sahara
1777 - name: additional_service:ceilometer
1778 - name: additional_service:ironic
1779 - name: additional_service:ceilometer
1780 bind:
1781 - "settings:additional_components.ceilometer.value"
1782 weight: 30
1783 label: "dialog.create_cluster_wizard.additional.install_ceilometer"
1784 description: "dialog.create_cluster_wizard.additional.install_ceilometer_description"
1785 compatible:
1786 - name: hypervisor:qemu
1787 - name: network:neutron:core:ml2
1788 - name: network:neutron:ml2:vlan
1789 - name: network:neutron:ml2:tun
1790 - name: storage:block:lvm
1791 - name: storage:block:ceph
1792 - name: storage:object:ceph
1793 - name: storage:ephemeral:ceph
1794 - name: storage:image:ceph
1795 - name: additional_service:sahara
1796 - name: additional_service:ironic 1784 - name: additional_service:ironic
1797 - name: additional_service:ironic 1785 - name: additional_service:ironic
1798 bind: 1786 bind:
@@ -1810,7 +1798,6 @@
1810 - name: storage:ephemeral:ceph 1798 - name: storage:ephemeral:ceph
1811 - name: storage:image:ceph 1799 - name: storage:image:ceph
1812 - name: additional_service:sahara 1800 - name: additional_service:sahara
1813 - name: additional_service:ceilometer
1814 incompatible: 1801 incompatible:
1815 - name: network:neutron:ml2:tun 1802 - name: network:neutron:ml2:tun
1816 message: "dialog.create_cluster_wizard.additional.ironic_network_mode_alert" 1803 message: "dialog.create_cluster_wizard.additional.ironic_network_mode_alert"