diff --git a/doc/source/admintasks/admin-application-commands-and-helm-overrides.rst b/doc/source/admintasks/admin-application-commands-and-helm-overrides.rst index 63fc3e03d..34310317f 100644 --- a/doc/source/admintasks/admin-application-commands-and-helm-overrides.rst +++ b/doc/source/admintasks/admin-application-commands-and-helm-overrides.rst @@ -9,6 +9,10 @@ Application Commands and Helm Overrides Use |prod| :command:`system application` and :command:`system helm-override` commands to manage containerized applications provided as part of |prod|. +.. note:: + Application commands and Helm overrides apply to **user overrides** only + and take precedence over system overrides. + .. rubric:: |proc| - Use the following command to list all containerized applications provided diff --git a/doc/source/fault-mgmt/kubernetes/enabling-snmp-support.rst b/doc/source/fault-mgmt/kubernetes/enabling-snmp-support.rst index af1861bae..3904d0059 100644 --- a/doc/source/fault-mgmt/kubernetes/enabling-snmp-support.rst +++ b/doc/source/fault-mgmt/kubernetes/enabling-snmp-support.rst @@ -147,7 +147,7 @@ In order to enable and configure |SNMP|, complete the following steps. .. code-block:: none - ~(keystone_admin)$ system helm-override-update --values user_conf.yaml snmp snmp kube-system + ~(keystone_admin)$ system helm-override-update --reuse-values --values user_conf.yaml snmp snmp kube-system +----------------+------------------------------------------------------------------------------------------------------------+ | Property | Value | +----------------+------------------------------------------------------------------------------------------------------------+ @@ -230,7 +230,7 @@ In order to enable and configure |SNMP|, complete the following steps. .. code-block:: none - ~(keystone_admin)$ system helm-override-update --values snmp_port.yaml nginx-ingress-controller ingress-nginx kube-system + ~(keystone_admin)$ system helm-override-update --reuse-values --values snmp_port.yaml nginx-ingress-controller ingress-nginx kube-system +----------------+------------------------------------------+ | Property | Value | +----------------+------------------------------------------+ @@ -369,7 +369,7 @@ update its configuration. .. code-block:: none - ~(keystone_admin)$ system helm-override-update --values user_conf.yaml snmp snmp kube-system + ~(keystone_admin)$ system helm-override-update --reuse-values --values user_conf.yaml snmp snmp kube-system +----------------+------------------------------------------------------------------------------------------------------------+ | Property | Value | +----------------+------------------------------------------------------------------------------------------------------------+ @@ -442,7 +442,7 @@ Modify the external UDP port used for receiving SNMP requests. .. code-block:: none - ~(keystone_admin)$ system helm-override-update --values snmp_port.yaml nginx-ingress-controller nginx-ingress kube-system + ~(keystone_admin)$ system helm-override-update --reuse-values --values snmp_port.yaml nginx-ingress-controller nginx-ingress kube-system +----------------+------------------------------------------+ | Property | Value | +----------------+------------------------------------------+ @@ -511,7 +511,7 @@ traps will not be generated. .. code-block:: none - ~(keystone_admin)$ system helm-override-update --values user_conf.yaml snmp snmp kube-system + ~(keystone_admin)$ system helm-override-update --reuse-values --values user_conf.yaml snmp snmp kube-system ~(keystone_admin)$ system application-apply snmp #. Modify your nginx ingress controller Helm chart values file @@ -537,5 +537,5 @@ traps will not be generated. .. code-block:: none - ~(keystone_admin)$ system helm-override-update --values snmp_port.yaml nginx-ingress-controller nginx-ingress kube-system + ~(keystone_admin)$ system helm-override-update --reuse-values --values snmp_port.yaml nginx-ingress-controller nginx-ingress kube-system ~(keystone_admin)$ system application-apply nginx-ingress-controller diff --git a/doc/source/security/kubernetes/enable-public-use-of-the-cert-manager-acmesolver-image.rst b/doc/source/security/kubernetes/enable-public-use-of-the-cert-manager-acmesolver-image.rst index 47557809e..68ebabf81 100644 --- a/doc/source/security/kubernetes/enable-public-use-of-the-cert-manager-acmesolver-image.rst +++ b/doc/source/security/kubernetes/enable-public-use-of-the-cert-manager-acmesolver-image.rst @@ -64,7 +64,7 @@ repository, see |admintasks-doc|: :ref:`Set up a Public Repository in Local Dock .. code-block:: none - ~(keystone_admin)]$ system helm-override-update --values cm-override-values.yaml cert-manager cert-manager cert-manager + ~(keystone_admin)]$ system helm-override-update --reuse-values --values cm-override-values.yaml cert-manager cert-manager cert-manager #. Reapply cert-manager. diff --git a/doc/source/security/kubernetes/private-namespace-and-restricted-rbac.rst b/doc/source/security/kubernetes/private-namespace-and-restricted-rbac.rst index 25e3508b3..8153b1e31 100644 --- a/doc/source/security/kubernetes/private-namespace-and-restricted-rbac.rst +++ b/doc/source/security/kubernetes/private-namespace-and-restricted-rbac.rst @@ -189,7 +189,7 @@ with read/write type access to a single private namespace .. code-block:: none - ~(keystone_admin)$ system helm-override-update --values rbd-namespaces.yaml \ + ~(keystone_admin)$ system helm-override-update --reuse-values --values rbd-namespaces.yaml \ platform-integ-apps rbd-provisioner kube-system #. Apply the application. diff --git a/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst b/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst index 4fd1f5b48..18b55820a 100644 --- a/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst +++ b/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst @@ -9,6 +9,10 @@ Application Commands and Helm Overrides Use |prod| :command:`system application` and :command:`system helm-override` commands to manage containerized applications provided as part of |prod|. +.. note:: + Application commands and Helm overrides apply to **user overrides** only + and take precedence over system overrides. + .. rubric:: |proc| - Use the following command to list all containerized applications provided diff --git a/doc/source/system_configuration/openstack/configuring-a-live-migration-completion-timeout-in-nova.rst b/doc/source/system_configuration/openstack/configuring-a-live-migration-completion-timeout-in-nova.rst index 5ba827325..bd3ef11b5 100644 --- a/doc/source/system_configuration/openstack/configuring-a-live-migration-completion-timeout-in-nova.rst +++ b/doc/source/system_configuration/openstack/configuring-a-live-migration-completion-timeout-in-nova.rst @@ -36,7 +36,7 @@ to apply other Nova overrides globally. .. parsed-literal:: - ~(keystone_admin)]$ system helm-override-update --values ./nova_override.yaml |prefix|-openstack nova openstack --reuse-values + ~(keystone_admin)]$ system helm-override-update --reuse-values --values ./nova_override.yaml |prefix|-openstack nova openstack --reuse-values #. Confirm that the user\_override lists the correct live migration completion timeout. diff --git a/doc/source/system_configuration/openstack/configuring-a-pci-alias-in-nova.rst b/doc/source/system_configuration/openstack/configuring-a-pci-alias-in-nova.rst index 9f6a9d32c..6b79e671d 100644 --- a/doc/source/system_configuration/openstack/configuring-a-pci-alias-in-nova.rst +++ b/doc/source/system_configuration/openstack/configuring-a-pci-alias-in-nova.rst @@ -89,7 +89,7 @@ list. .. parsed-literal:: - ~(keystone_admin)]$ system helm-override-update --values ./gpu_override.yaml |prefix|-openstack nova openstack --reuse-values + ~(keystone_admin)]$ system helm-override-update --reuse-values --values ./gpu_override.yaml |prefix|-openstack nova openstack --reuse-values #. Apply the changes. diff --git a/doc/source/system_configuration/openstack/configuring-the-rpc-response-timeout-in-cinder.rst b/doc/source/system_configuration/openstack/configuring-the-rpc-response-timeout-in-cinder.rst index 32ac371e2..d64f225ed 100644 --- a/doc/source/system_configuration/openstack/configuring-the-rpc-response-timeout-in-cinder.rst +++ b/doc/source/system_configuration/openstack/configuring-the-rpc-response-timeout-in-cinder.rst @@ -26,7 +26,7 @@ override. .. parsed-literal:: - ~(keystone_admin)]$ system helm-override-update --values /home/sysadmin/cinder-overrides.yaml |prefix|-openstack cinder openstack --reuse-values + ~(keystone_admin)]$ system helm-override-update --reuse-values --values /home/sysadmin/cinder-overrides.yaml |prefix|-openstack cinder openstack #. Confirm that the user\_override lists the correct live migration completion timeout.