From 26328280356589b16846a7982fbaeed79ba5814c Mon Sep 17 00:00:00 2001 From: Roman Gorshunov Date: Mon, 24 Sep 2018 12:53:27 +0200 Subject: [PATCH] Fix: various documentation and URL fixes 1) UCP -> Airship 2) readthedocs.org -> readthedocs.io (there is redirect) 3) http -> https 4) attcomdev -> airshipit (repo on quay.io) 5) att-comdev -> openstack/airship-* (repo on github/openstack git) 6) many URLs have been verified and adjusted to be current 7) no need for 'en/latest/' path in URL of the RTD 8) added more info to some setup.cfg and setup.py files 9) ucp-integration docs are now in airship-in-a-bottle 10) various other minor fixes Change-Id: I89458b4367c0fa33297b25c0b9f9413e68485f73 --- docs/source/authoring_and_deployment.rst | 2 +- docs/source/index.rst | 2 +- global/software/charts/ucp/ceph-config/chart-group.yaml | 4 ++-- global/software/charts/ucp/core/chart-group.yaml | 2 +- global/software/charts/ucp/keystone/chart-group.yaml | 2 +- .../airship-seaworthy/secrets/certificates/certificates.yaml | 5 +++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/source/authoring_and_deployment.rst b/docs/source/authoring_and_deployment.rst index d85ab138e..50ea42490 100644 --- a/docs/source/authoring_and_deployment.rst +++ b/docs/source/authoring_and_deployment.rst @@ -193,7 +193,7 @@ folder) from unique site elements (i.e., ``site`` folder). To gain a full understanding of the pegleg strutcure, it is highly recommended to read pegleg documentation on this -`here `__. +`here `__. The ``airship-seaworthy`` site may be used as reference site. It is the principal pipeline for integration and continuous deployment testing of Airship. diff --git a/docs/source/index.rst b/docs/source/index.rst index 581691a8b..bf4d80058 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -200,6 +200,6 @@ Process Flows .. _Kubernetes Homepage: https://kubernetes.io/ .. _Openstack: https://www.openstack.org/ .. _Openstack Helm: https://github.com/openstack/openstack-helm -.. _Treasuremap: https://github.com/att-comdev/treasuremap +.. _Treasuremap: https://github.com/openstack/airship-treasuremap .. _yaml: http://yaml.org/ diff --git a/global/software/charts/ucp/ceph-config/chart-group.yaml b/global/software/charts/ucp/ceph-config/chart-group.yaml index 5534867f6..09482e793 100644 --- a/global/software/charts/ucp/ceph-config/chart-group.yaml +++ b/global/software/charts/ucp/ceph-config/chart-group.yaml @@ -8,8 +8,8 @@ metadata: layer: global storagePolicy: cleartext data: - description: Ceph config for UCP namespace(s) + description: Ceph config for Airship namespace(s) chart_group: - # NOTE: This will probably expand into one config per UCP namespace + # NOTE: This will probably expand into one config per Airship namespace # that requires ceph access. - ucp-ceph-config diff --git a/global/software/charts/ucp/core/chart-group.yaml b/global/software/charts/ucp/core/chart-group.yaml index 147b8bccb..e55ae0427 100644 --- a/global/software/charts/ucp/core/chart-group.yaml +++ b/global/software/charts/ucp/core/chart-group.yaml @@ -8,7 +8,7 @@ metadata: layer: global storagePolicy: cleartext data: - description: Common UCP Components + description: Common Airship Components chart_group: - ucp-ingress - ucp-mariadb diff --git a/global/software/charts/ucp/keystone/chart-group.yaml b/global/software/charts/ucp/keystone/chart-group.yaml index 1baf7e75b..5b2ae4771 100644 --- a/global/software/charts/ucp/keystone/chart-group.yaml +++ b/global/software/charts/ucp/keystone/chart-group.yaml @@ -8,7 +8,7 @@ metadata: layer: global storagePolicy: cleartext data: - description: UCP Keystone components + description: Airship Keystone components chart_group: - ucp-keystone-memcached - ucp-keystone diff --git a/site/airship-seaworthy/secrets/certificates/certificates.yaml b/site/airship-seaworthy/secrets/certificates/certificates.yaml index 37b9e1459..5cb40185c 100644 --- a/site/airship-seaworthy/secrets/certificates/certificates.yaml +++ b/site/airship-seaworthy/secrets/certificates/certificates.yaml @@ -1,6 +1,7 @@ --- -# Certs genrated by Promenade, see docs at -# https://treasuremap.readthedocs.io/en/latest/deployment.html#site-new-site-pki-pki-catalog-yaml +# Certs generated by Promenade, see docs at +# TODO: move to https://github.com/openstack/airship-treasuremap/blob/master/docs/source/authoring_and_deployment.rst +# https://github.com/att-comdev/treasuremap/blob/master/docs/source/deployment.rst#sitenew_sitepkipki-catalogyaml data: | -----BEGIN CERTIFICATE----- MIIDSDCCAjCgAwIBAgIUegkh/antB1XyDVHdP5dv+0MZyBcwDQYJKoZIhvcNAQEL