diff --git a/doc/source/developer_resources/move_to_new_openstack_version_in_starlingx.rst b/doc/source/developer_resources/move_to_new_openstack_version_in_starlingx.rst index 2484c49bb..ebe365064 100644 --- a/doc/source/developer_resources/move_to_new_openstack_version_in_starlingx.rst +++ b/doc/source/developer_resources/move_to_new_openstack_version_in_starlingx.rst @@ -220,7 +220,6 @@ Here are some tips for testing and debugging your upgrade: .. parsed-literal:: tail -f /var/log/sysinv.log - tail -f /var/log/armada/|prefix|-openstack-apply.log kubectl -n openstack get po kubectl -n openstack logs nova-compute-compute-0-75ea0372-nmtz2 kubectl -n openstack exec -it nova-compute-compute-0-31b0f4b3-2rqgf -- bash diff --git a/doc/source/introduction/functional_overview.rst b/doc/source/introduction/functional_overview.rst index 96bff794a..dac2cb975 100644 --- a/doc/source/introduction/functional_overview.rst +++ b/doc/source/introduction/functional_overview.rst @@ -60,7 +60,7 @@ Where: - Helm / Tiller – Kubernetes Package Manager, and - - FluxCd or Armada Airship (deprecated) + - FluxCD **OpenStack** - Keystone - Identity management diff --git a/doc/source/operations/ceph_cluster_aio_duplex_migration.rst b/doc/source/operations/ceph_cluster_aio_duplex_migration.rst index 99300d5d5..56cff7493 100644 --- a/doc/source/operations/ceph_cluster_aio_duplex_migration.rst +++ b/doc/source/operations/ceph_cluster_aio_duplex_migration.rst @@ -1114,9 +1114,9 @@ Apply application |prefix|-openstack again. +---------------+----------------------------------+ | active | True | | app_version | 1.0-45 | - | created_at | 2020-07-08T05:47:24.019723+00:00 | + | created_at | 2022-10-27T17:11:04.620160+00:00 | | manifest_file | |prefix|-openstack.yaml |s| | - | manifest_name | armada-manifest | + | manifest_name | stx-openstack-fluxcd-manifests | | name | |prefix|-openstack |s| | | progress | None | | status | applying | diff --git a/doc/source/operations/ceph_cluster_aio_simplex_migration.rst b/doc/source/operations/ceph_cluster_aio_simplex_migration.rst index 4a4082d53..bc61232c1 100644 --- a/doc/source/operations/ceph_cluster_aio_simplex_migration.rst +++ b/doc/source/operations/ceph_cluster_aio_simplex_migration.rst @@ -650,9 +650,9 @@ Apply application |prefix|-openstack again. +---------------+----------------------------------+ | active | True | | app_version | 1.0-45 | - | created_at | 2020-07-08T05:47:24.019723+00:00 | + | created_at | 2022-10-27T17:11:04.620160+00:00 | | manifest_file | |prefix|-openstack.yaml |s| | - | manifest_name | armada-manifest | + | manifest_name | stx-openstack-fluxcd-manifests | | name | |prefix|-openstack |s| | | progress | None | | status | applying | diff --git a/doc/source/operations/ceph_cluster_migration.rst b/doc/source/operations/ceph_cluster_migration.rst index aa5191a4a..03a5669a2 100644 --- a/doc/source/operations/ceph_cluster_migration.rst +++ b/doc/source/operations/ceph_cluster_migration.rst @@ -828,9 +828,9 @@ Apply application |prefix|-openstack again. +---------------+----------------------------------+ | active | True | | app_version | 1.0-45 | - | created_at | 2020-07-08T05:47:24.019723+00:00 | + | created_at | 2022-10-27T17:11:04.620160+00:00 | | manifest_file | |prefix|-openstack.yaml |s| | - | manifest_name | armada-manifest | + | manifest_name | stx-openstack-fluxcd-manifests | | name | |prefix|-openstack |s| | | progress | None | | status | applying | diff --git a/doc/source/system_configuration/index-sysconf-d511820651f0.rst b/doc/source/system_configuration/index-sysconf-d511820651f0.rst index a06dc39b6..b0f945409 100644 --- a/doc/source/system_configuration/index-sysconf-d511820651f0.rst +++ b/doc/source/system_configuration/index-sysconf-d511820651f0.rst @@ -28,9 +28,9 @@ StarlingX OpenStack .. os-begin -|prod-os| is installed and managed as an Armada application. +|prod-os| is installed and managed as an FluxCD application. -Armada Applications are a set of one or more interdependent Application Helm +FluxCD applications are a set of one or more interdependent Application Helm charts. In the case of |prod|, there is generally a Helm chart for every OpenStack service. diff --git a/doc/source/updates/openstack/apply-update-to-the-openstack-application.rst b/doc/source/updates/openstack/apply-update-to-the-openstack-application.rst index 7cd6cc6a5..0e79f4422 100644 --- a/doc/source/updates/openstack/apply-update-to-the-openstack-application.rst +++ b/doc/source/updates/openstack/apply-update-to-the-openstack-application.rst @@ -37,7 +37,7 @@ where the following are optional arguments: | | | -manifest | _manifest.yaml | | | | oidc-auth-apps | 20.06-28 | oidc-auth-manifest | manifest.yaml | uploaded | completed | | platform-integ-apps | 20.06-11 | platform-integration-manifest | manifest.yaml | applied | completed | - | |prefix|-openstack |s| | 21.07-0- | armada-manifest | |prefix|-openstack.yaml |s| | applied | completed | + | |prefix|-openstack |s| | 21.07-0- | stx-openstack-fluxcd-manifests| |prefix|-openstack.yaml |s| | applied | completed | | | centos- | | | | | | | stable- | | | | | | | versioned | | | | | @@ -104,7 +104,7 @@ and the following is a positional argument which must come last: | app_version | 21.07-0 | | created_at | 2020-05-02T17:11:48.718963+00:00 | | manifest_file | |prefix|-openstack.yaml |s| | - | manifest_name | openstack-armada-manifest | + | manifest_name | stx-openstack-fluxcd-manifests | | name | |prefix|-openstack |s| | | progress | completed | | status | applied |