Browse Source

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
Julia Aranovich 2 years ago
parent
commit
c0384fac05
1 changed files with 7 additions and 20 deletions
  1. 7
    20
      nailgun/nailgun/fixtures/openstack.yaml

+ 7
- 20
nailgun/nailgun/fixtures/openstack.yaml View File

@@ -112,6 +112,8 @@
112 112
             message: "Ceilometer should be enabled in the environment settings."
113 113
           - condition: "settings:additional_components.mongo.value == true"
114 114
             message: "You are already using external MongoDB."
115
+          - condition: "not ('experimental' in version:feature_groups)"
116
+            action: "hide"
115 117
         tags:
116 118
           - mongo
117 119
       base-os:
@@ -989,6 +991,9 @@
989 991
             description: "If selected, Ceilometer and Aodh components will be installed"
990 992
             weight: 60
991 993
             type: "checkbox"
994
+            restrictions:
995
+              - condition: "not ('experimental' in version:feature_groups)"
996
+                action: "hide"
992 997
           mongo:
993 998
             value: false
994 999
             label: "Use external Mongo DB"
@@ -996,6 +1001,8 @@
996 1001
             weight: 70
997 1002
             type: "checkbox"
998 1003
             restrictions:
1004
+              - condition: "not ('experimental' in version:feature_groups)"
1005
+                action: "hide"
999 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 1007
           ironic:
1001 1008
             value: false
@@ -1763,25 +1770,6 @@
1763 1770
         weight: 10
1764 1771
         label: "dialog.create_cluster_wizard.additional.install_sahara"
1765 1772
         description: "dialog.create_cluster_wizard.additional.install_sahara_description"
1766
-        compatible:
1767
-          - name: hypervisor:qemu
1768
-          - name: network:neutron:core:ml2
1769
-          - name: network:neutron:ml2:vlan
1770
-          - name: network:neutron:ml2:tun
1771
-          - name: storage:block:lvm
1772
-          - name: storage:block:ceph
1773
-          - name: storage:object:ceph
1774
-          - name: storage:ephemeral:ceph
1775
-          - name: storage:image:ceph
1776
-          - 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 1773
         compatible:
1786 1774
           - name: hypervisor:qemu
1787 1775
           - name: network:neutron:core:ml2
@@ -1810,7 +1798,6 @@
1810 1798
           - name: storage:ephemeral:ceph
1811 1799
           - name: storage:image:ceph
1812 1800
           - name: additional_service:sahara
1813
-          - name: additional_service:ceilometer
1814 1801
         incompatible:
1815 1802
           - name: network:neutron:ml2:tun
1816 1803
             message: "dialog.create_cluster_wizard.additional.ironic_network_mode_alert"

Loading…
Cancel
Save