From e3dc13bba5470a68050c8bb56e289dd01eb4abb1 Mon Sep 17 00:00:00 2001 From: Johann Lombardi Date: Mon, 25 Mar 2024 20:59:03 +0100 Subject: [PATCH] DAOS-8781 doc: remove dupllicated info with daos.io Remove references to wiki, jira and other links that are now on daos.io. Merge cloud content to installation section. Update Copyright to 2024. Signed-off-by: Johann Lombardi --- README.md | 6 +----- docs/QSG/cloud.md | 25 +++++++++++++++++++++---- docs/cloud/index.md | 25 ------------------------- mkdocs.yml | 11 ++--------- 4 files changed, 24 insertions(+), 43 deletions(-) delete mode 100644 docs/cloud/index.md diff --git a/README.md b/README.md index 663da905700..0bd1915919e 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,4 @@ Interact with members of the DAOS community real-time on [slack](https://daos-st An invitation to join the slack workspace is automatically sent when joining the community [mailing list](https://daos.groups.io/g/daos). -DAOS is a SODA Foundation project. - - - - +DAOS is a Linux Foundation project. diff --git a/docs/QSG/cloud.md b/docs/QSG/cloud.md index a2b55873f35..04f4d88982c 100644 --- a/docs/QSG/cloud.md +++ b/docs/QSG/cloud.md @@ -1,7 +1,24 @@ # Deploying DAOS in the Cloud -## Deploying DAOS in Google Cloud +In addition to on-prem deployments, DAOS can be deployed in cloud environments. -DAOS can be installed in GCP. Please refer to the -[How To Deploy DAOS in Google Cloud](https://github.com/GoogleCloudPlatform/hpc-toolkit/tree/main/community/examples/intel) -section of the Google Cloud HPC Toolkit documentation for details. +## Google Cloud + +DAOS is available as an HPC storage option in Google Cloud. + +To learn more about DAOS in Google Cloud, please refer to the +[Google Cloud DAOS repository](https://github.com/daos-stack/google-cloud-daos) +on github and the +[Google Cloud HPC Toolkit documentation for DAOS](https://github.com/GoogleCloudPlatform/hpc-toolkit/blob/main/community/modules/file-system/Intel-DAOS/README.md). + +A discussion forum for technical questions and support +for DAOS in Google Cloud is available in the +[DAOS on Google Cloud](https://daos-stack.slack.com/archives/C03GLTLHA59) +Slack channel. + +## IBM Cloud VPC + +DAOS is available in IBM Cloud VPC. + +To learn more about DAOS in IBM Cloud VPC, please refer to the +[IBM blog post](https://www.ibm.com/cloud/blog/daos-on-ibm-cloud-vpc). diff --git a/docs/cloud/index.md b/docs/cloud/index.md deleted file mode 100644 index 591229a9e8c..00000000000 --- a/docs/cloud/index.md +++ /dev/null @@ -1,25 +0,0 @@ -# DAOS in the Cloud - -In addition to on-prem deployments, DAOS can be deployed in cloud -environments. - -## DAOS in Google Cloud - -DAOS is available as an HPC storage option in Google Cloud. - -To learn more about DAOS in Google Cloud, please refer to the -[Google Cloud DAOS repository](https://github.com/daos-stack/google-cloud-daos) -on github and the -[Google Cloud HPC Toolkit documentation for DAOS](https://github.com/GoogleCloudPlatform/hpc-toolkit/blob/main/community/modules/file-system/Intel-DAOS/README.md). - -A discussion forum for technical questions and support -for DAOS in Google Cloud is available in the -[DAOS on Google Cloud](https://daos-stack.slack.com/archives/C03GLTLHA59) -Slack channel. - -## DAOS in IBM Cloud VPC - -DAOS is available in IBM Cloud VPC. - -To learn more about DAOS in IBM Cloud VPC, please refer to the -[IBM blog post](https://www.ibm.com/cloud/blog/daos-on-ibm-cloud-vpc). diff --git a/mkdocs.yml b/mkdocs.yml index 82c3c8125d8..ccec0e94b38 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -8,7 +8,7 @@ repo_name: daos-stack/daos repo_url: https://github.com/daos-stack/daos # edit_uri: blob/release/2.6/docs/ edit_uri: blob/master/docs/ -copyright: Copyright 2016-2023 Intel Corporation +copyright: Copyright 2016-2024 Intel Corporation # Theme theme: @@ -55,18 +55,11 @@ markdown_extensions: # Page tree nav: - - Intro: - - 'index.md' - - 'Community Wiki': 'https://wiki.daos.io/' - - 'Community Roadmap': 'https://wiki.daos.io/spaces/DC/pages/4836661105/Roadmap' - - 'Community Mailing list': 'https://daos.groups.io/g/daos' - - 'DAOS in the Cloud': 'cloud/index.md' - - 'Issue tracker': 'https://jira.daos.io/' - Release Information: + - 'index.md' - 'Release Notes v2.5': 'release/release_notes.md' - 'Support Matrix v2.5': 'release/support_matrix.md' - 'Upgrading to v2.5': 'release/upgrading.md' - - 'Roadmap': 'https://wiki.daos.io/spaces/DC/pages/4836661105/Roadmap' - Overview: - 'Architecture': 'overview/architecture.md' - 'Storage Model': 'overview/storage.md'