From 832e76d8db8d06b57b48fe55e22e1be0c7d62745 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: I0833a53ecb419b5626dd7b525dc637cb84b5267e --- .../v1.0demo/schemas/shipyard/DeploymentConfiguration/v1.yaml | 2 +- .../v1.0demo/schemas/shipyard/DeploymentStrategy/v1.yaml | 2 +- .../global/v1.0demo/software/charts/ucp/core/chart-group.yaml | 2 +- .../v1.0demo/software/charts/ucp/keystone/chart-group.yaml | 2 +- .../v1.0demo/software/charts/ucp/services-chart-group.yaml | 2 +- .../global/v1.0demo/software/config/versions.yaml | 1 + .../v1.0dev/schemas/shipyard/DeploymentConfiguration/v1.yaml | 2 +- .../v1.0dev/schemas/shipyard/DeploymentStrategy/v1.yaml | 2 +- .../global/v1.0dev/software/charts/ucp/core/chart-group.yaml | 2 +- .../v1.0dev/software/charts/ucp/keystone/chart-group.yaml | 2 +- .../v1.0dev/software/charts/ucp/services-chart-group.yaml | 2 +- deployment_files/global/v1.0dev/software/config/versions.yaml | 1 + doc/source/dev-getting-started.rst | 4 ++-- doc/source/documentation-conventions.rst | 2 +- tools/multi_nodes_gate/airship_gate/lib/virsh.sh | 4 ++-- tools/multi_nodes_gate/registry/IMAGES | 2 +- 16 files changed, 18 insertions(+), 16 deletions(-) diff --git a/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentConfiguration/v1.yaml b/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentConfiguration/v1.yaml index 2b955aeb..6deab8b6 100644 --- a/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentConfiguration/v1.yaml +++ b/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentConfiguration/v1.yaml @@ -7,7 +7,7 @@ metadata: application: shipyard data: $schema: 'http://json-schema.org/schema#' - id: 'https://github.com/att-comdev/shipyard/deploymentConfiguration.yaml' + id: 'https://git.airshipit.org/cgit/airship-shipyard/tree/src/bin/shipyard_airflow/shipyard_airflow/schemas/deploymentConfiguration.yaml' type: 'object' properties: physical_provisioner: diff --git a/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentStrategy/v1.yaml b/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentStrategy/v1.yaml index 51bda9f0..927512b5 100644 --- a/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentStrategy/v1.yaml +++ b/deployment_files/global/v1.0demo/schemas/shipyard/DeploymentStrategy/v1.yaml @@ -7,7 +7,7 @@ metadata: application: shipyard data: $schema: 'http://json-schema.org/schema#' - id: 'https://github.com/att-comdev/shipyard/deploymentStrategy.yaml' + id: 'https://git.airshipit.org/cgit/airship-shipyard/tree/src/bin/shipyard_airflow/shipyard_airflow/schemas/deploymentStrategy.yaml' type: 'object' required: - groups diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/chart-group.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/chart-group.yaml index b9af32b3..1eb2c733 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/core/chart-group.yaml +++ b/deployment_files/global/v1.0demo/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/deployment_files/global/v1.0demo/software/charts/ucp/keystone/chart-group.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/keystone/chart-group.yaml index 1baf7e75..5b2ae477 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/keystone/chart-group.yaml +++ b/deployment_files/global/v1.0demo/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/deployment_files/global/v1.0demo/software/charts/ucp/services-chart-group.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/services-chart-group.yaml index 394428bf..828b3510 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/services-chart-group.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/services-chart-group.yaml @@ -8,7 +8,7 @@ metadata: layer: global storagePolicy: cleartext data: - description: UCP Services + description: Airship Services sequenced: true chart_group: - ucp-maas diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml index 69e82dc8..d5d8c8d3 100644 --- a/deployment_files/global/v1.0demo/software/config/versions.yaml +++ b/deployment_files/global/v1.0demo/software/config/versions.yaml @@ -507,6 +507,7 @@ data: maas_region: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 bootstrap: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 export_api_key: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 + # TODO: update to verified quay.io/airshipit/sstream-cache image maas_cache: quay.io/airshipit/sstream-cache:dfb92ce07f87648f3423be11e51425923bc9f8b1 ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 error_pages: gcr.io/google_containers/defaultbackend:1.0 diff --git a/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentConfiguration/v1.yaml b/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentConfiguration/v1.yaml index 2b955aeb..6deab8b6 100644 --- a/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentConfiguration/v1.yaml +++ b/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentConfiguration/v1.yaml @@ -7,7 +7,7 @@ metadata: application: shipyard data: $schema: 'http://json-schema.org/schema#' - id: 'https://github.com/att-comdev/shipyard/deploymentConfiguration.yaml' + id: 'https://git.airshipit.org/cgit/airship-shipyard/tree/src/bin/shipyard_airflow/shipyard_airflow/schemas/deploymentConfiguration.yaml' type: 'object' properties: physical_provisioner: diff --git a/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentStrategy/v1.yaml b/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentStrategy/v1.yaml index 51bda9f0..927512b5 100644 --- a/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentStrategy/v1.yaml +++ b/deployment_files/global/v1.0dev/schemas/shipyard/DeploymentStrategy/v1.yaml @@ -7,7 +7,7 @@ metadata: application: shipyard data: $schema: 'http://json-schema.org/schema#' - id: 'https://github.com/att-comdev/shipyard/deploymentStrategy.yaml' + id: 'https://git.airshipit.org/cgit/airship-shipyard/tree/src/bin/shipyard_airflow/shipyard_airflow/schemas/deploymentStrategy.yaml' type: 'object' required: - groups diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/core/chart-group.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/core/chart-group.yaml index b9af32b3..1eb2c733 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/core/chart-group.yaml +++ b/deployment_files/global/v1.0dev/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/deployment_files/global/v1.0dev/software/charts/ucp/keystone/chart-group.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/keystone/chart-group.yaml index 1baf7e75..5b2ae477 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/keystone/chart-group.yaml +++ b/deployment_files/global/v1.0dev/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/deployment_files/global/v1.0dev/software/charts/ucp/services-chart-group.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/services-chart-group.yaml index 394428bf..828b3510 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/services-chart-group.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/services-chart-group.yaml @@ -8,7 +8,7 @@ metadata: layer: global storagePolicy: cleartext data: - description: UCP Services + description: Airship Services sequenced: true chart_group: - ucp-maas diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml index 45595313..9376cdf4 100644 --- a/deployment_files/global/v1.0dev/software/config/versions.yaml +++ b/deployment_files/global/v1.0dev/software/config/versions.yaml @@ -356,6 +356,7 @@ data: maas_region: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 bootstrap: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 export_api_key: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1 + # TODO: update to verified quay.io/airshipit/sstream-cache image maas_cache: quay.io/attcomdev/sstream-cache@sha256:sha256:90d0dc73785534ef6a3035265275e197a66727beeb9c979f60d3bbf31a6a8864 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 keystone: diff --git a/doc/source/dev-getting-started.rst b/doc/source/dev-getting-started.rst index 78edf3ae..49a47fb5 100644 --- a/doc/source/dev-getting-started.rst +++ b/doc/source/dev-getting-started.rst @@ -145,7 +145,7 @@ Integration testing is orchestrated in the merge gates, and uses various means of testing. .. _Airflow: https://airflow.apache.org/ -.. _Armada: http://airship-armada.readthedocs.io/en/latest/index.html +.. _Armada: https://airship-armada.readthedocs.io/ .. _Calico: https://www.projectcalico.org/calico-networking-for-kubernetes/ .. _Ceph: https://ceph.com .. _etcd: https://coreos.com/etcd/ @@ -155,7 +155,7 @@ of testing. .. _Keystone: https://docs.openstack.org/keystone/latest/ .. _Kubernetes: https://kubernetes.io/ .. _oslo.policy: https://docs.openstack.org/oslo.policy/latest/ -.. _Promenade: https://promenade.readthedocs.io/en/latest/ +.. _Promenade: https://airship-promenade.readthedocs.io/ .. _pytest: https://docs.pytest.org/en/latest/ .. _quay.io: https://quay.io/organization/airshipit .. _stestr: https://github.com/mtreinish/stestr diff --git a/doc/source/documentation-conventions.rst b/doc/source/documentation-conventions.rst index 8dae2f53..42c97ae4 100644 --- a/doc/source/documentation-conventions.rst +++ b/doc/source/documentation-conventions.rst @@ -81,7 +81,7 @@ main/index page of their `Readthedocs`_ documentation: .. _reStructuredText: http://www.sphinx-doc.org/en/stable/rest.html .. _Markdown: https://daringfireball.net/projects/markdown/syntax -.. _Readthedocs: https://airshipit.readthedocs.org/ +.. _Readthedocs: https://airshipit.readthedocs.io/ .. _Github: https://github.com .. _Sphinx: http://www.sphinx-doc.org/en/stable/index.html .. _Treasuremap: https://github.com/openstack/airship-treasuremap \ No newline at end of file diff --git a/tools/multi_nodes_gate/airship_gate/lib/virsh.sh b/tools/multi_nodes_gate/airship_gate/lib/virsh.sh index 31e4dfe0..9e0eb219 100644 --- a/tools/multi_nodes_gate/airship_gate/lib/virsh.sh +++ b/tools/multi_nodes_gate/airship_gate/lib/virsh.sh @@ -84,14 +84,14 @@ iso_path() { net_clean() { if virsh net-list --name | grep ^airship_gate$ > /dev/null; then - log Destroying UCP gate network + log Destroying Airship gate network virsh net-destroy "${XML_DIR}/network.xml" &>> "${LOG_FILE}" fi } net_declare() { if ! virsh net-list --name | grep ^airship_gate$ > /dev/null; then - log Creating UCP gate network + log Creating Airship gate network virsh net-create "${XML_DIR}/network.xml" &>> "${LOG_FILE}" fi } diff --git a/tools/multi_nodes_gate/registry/IMAGES b/tools/multi_nodes_gate/registry/IMAGES index e94ba524..2b2871cf 100644 --- a/tools/multi_nodes_gate/registry/IMAGES +++ b/tools/multi_nodes_gate/registry/IMAGES @@ -6,7 +6,7 @@ gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64 gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64 gcr.io/kubernetes-helm/tiller,v2.7.2,tiller lachlanevenson/k8s-helm,v2.7.2,helm -quay.io/attcomdev/armada,latest,armada +quay.io/airshipit/armada,latest,armada quay.io/calico/cni,v1.11.0,calico-cni quay.io/calico/ctl,v1.6.1,calico-ctl quay.io/calico/kube-controllers,v1.0.0,calico-kube-controllers