F OpenNebula/one#6430: Sunstone review of Configuration Management

Signed-off-by: dcarracedo <[email protected]>
OpenNebula · Jul 12, 2024 · dc9ec94 · dc9ec94
1 parent 105a64c
commit dc9ec94
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/source/installation_and_configuration/configuration_management/appendix.rst b/source/installation_and_configuration/configuration_management/appendix.rst
@@ -41,10 +41,6 @@ Name                                                               Type
 ``/etc/one/onehem-server.conf``                                    YAML
 ``/etc/one/packet_driver.default``                                 Plain file (or XML)
 ``/etc/one/sched.conf``                                            oned.conf-like
-``/etc/one/sunstone-logos.yaml``                                   YAML w/ ordered arrays
-``/etc/one/sunstone-server.conf``                                  YAML
-``/etc/one/sunstone-views.yaml``                                   YAML
-``/etc/one/sunstone-views/**/*.yaml``                              YAML
 ``/etc/one/tmrc``                                                  Shell
 ``/etc/one/vcenter_driver.conf``                                   YAML
 ``/etc/one/vcenter_driver.default``                                Plain file (or XML)

diff --git a/source/installation_and_configuration/configuration_management/conflicts.rst b/source/installation_and_configuration/configuration_management/conflicts.rst
@@ -88,11 +88,11 @@ Example of multiple patch modes for multiple files:
     # onecfg upgrade \
         --patch-modes skip:/etc/one/oned.conf \
         --patch-modes skip,replace:/etc/one/oned.conf:5.10.0 \
-        --patch-modes force:/etc/one/sunstone-logos.yaml:5.6.0 \
-        --patch-modes replace:/etc/one/sunstone-server.conf \
-        --patch-modes skip:/etc/one/sunstone-views/admin.yaml:5.4.1 \
-        --patch-modes skip:/etc/one/sunstone-views/admin.yaml:5.4.2 \
-        --patch-modes skip:/etc/one/sunstone-views/kvm/admin.yaml
+        --patch-modes force:/etc/one/fireedge/sunstone-views.yaml:5.6.0 \
+        --patch-modes replace:/etc/one/fireedge-server.conf \
+        --patch-modes skip:/etc/one/fireedge/sunstone/admin/acl-tab.yaml:5.4.1 \
+        --patch-modes skip:/etc/one/fireedge/sunstone/admin/vm-tab.yaml:5.4.2 \
+        --patch-modes skip:/etc/one/fireedge/sunstone/admin/vm-template-tab.yaml
 
 Restore from Backup
 ===================

diff --git a/source/installation_and_configuration/configuration_management/diff_formats.rst b/source/installation_and_configuration/configuration_management/diff_formats.rst
@@ -79,17 +79,16 @@ these paths are valid to address the emphasized parameters:
 
 	In the ``oned.conf``-like configurations, some nested structures are unique (e.g., ``DB=[...]`` is just a single database connection configuration) and some can appear several times (e.g., ``VM_MAD=[...]`` configures execution of different drivers for different hypervisors, one section for each driver). In the second case, the nested structure is uniquely addressed by a value of one identifying parameter inside the structure, usually ``NAME``. This value (including the quotes) is placed as part of the path. See path 3 above.
 
-- for the following ``/etc/one/sunstone-server.conf`` snippet
+- for the following ``/etc/one/fireedge-server.conf`` snippet
 
 .. code::
 
-    # OpenNebula sever contact information
+    # OpenNebula: use it if you have oned and fireedge on different servers
     :one_xmlrpc: http://localhost:2633/RPC2     # path 4
-    :one_xmlrpc_timeout: 60
 
 these paths are valid to address the emphasized parameter(s):
 
-  4. ``:one_xmlrpc`` or ``":one_xmlrpc"``
+  1. ``:one_xmlrpc`` or ``":one_xmlrpc"``
 
 - for the following ``/etc/one/cli/oneimage.yaml`` snippet