diff --git a/charts/promenade/values.yaml b/charts/promenade/values.yaml index 9ac885fa..569efeae 100644 --- a/charts/promenade/values.yaml +++ b/charts/promenade/values.yaml @@ -33,7 +33,7 @@ conf: images: tags: - promenade: quay.io/attcomdev/promenade:latest + promenade: quay.io/airshipit/promenade:latest ks_user: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton ks_endpoints: docker.io/openstackhelm/heat:newton diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index 87fcb34f..77032bca 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -37,7 +37,7 @@ Here is a complete sample document: - promenade-genesis=enabled - ucp-control-plane=enabled images: - armada: quay.io/attcomdev/armada:latest + armada: quay.io/airshipit/armada:latest helm: tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 kubernetes: diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst index 9317b606..1625ec44 100644 --- a/doc/source/configuration/index.rst +++ b/doc/source/configuration/index.rst @@ -25,5 +25,5 @@ The provided Armada_ manifest and will be applied on the genesis node as soon as it is healthy. -.. _Armada: https://github.com/att-comdev/armada -.. _Deckhand: https://github.com/att-comdev/deckhand +.. _Armada: https://github.com/openstack/airship-armada +.. _Deckhand: https://github.com/openstack/airship-deckhand diff --git a/doc/source/design.rst b/doc/source/design.rst index 3c0e80e5..4fa629f1 100644 --- a/doc/source/design.rst +++ b/doc/source/design.rst @@ -6,7 +6,7 @@ Promenade is a Kubernetes_ cluster deployment tool with the following goals: * Resiliency in the face of node loss and full cluster reboot. * Bare metal node support without external runtime dependencies. * Providing a fully functional single-node cluster to allow cluster-hosted - `tooling `_ to provision the + `tooling `_ to provision the remaining cluster nodes. * Helm_ chart managed component life-cycle. * API-managed cluster life-cycle. @@ -261,18 +261,18 @@ Alternatives * Does not support chart-based management of components -.. _Armada: https://github.com/att-comdev/armada +.. _Armada: https://github.com/openstack/airship-armada .. _Bootkube: https://github.com/kubernetes-incubator/bootkube .. _CNI: https://github.com/containernetworking/cni .. _Calico: https://github.com/projectcalico/calico .. _CoreDNS: https://github.com/coredns/coredns -.. _Deckhand: https://github.com/att-comdev/deckhand +.. _Deckhand: https://github.com/openstack/airship-deckhand .. _Docker: https://www.docker.com -.. _Drydock: https://github.com/att-comdev/drydock +.. _Drydock: https://github.com/openstack/airship-drydock .. _Etcd: https://github.com/coreos/etcd .. _HAProxy: http://www.haproxy.org .. _Helm: https://github.com/kubernetes/helm .. _kops: https://github.com/kubernetes/kops .. _Kubeadm: https://github.com/kubernetes/kubeadm .. _Kubernetes: https://github.com/kubernetes/kubernetes -.. _Shipyard: https://github.com/att-comdev/shipyard +.. _Shipyard: https://github.com/openstack/airship-shipyard diff --git a/doc/source/getting-started.rst b/doc/source/getting-started.rst index 3c2c775d..a0132b02 100644 --- a/doc/source/getting-started.rst +++ b/doc/source/getting-started.rst @@ -3,7 +3,7 @@ Getting Started Note: This document is meant to give a general understanding of how Promenade could be exercised in a development environment or for general learning and -understanding. For holistic UCP deployment procedures, refer to `Treasuremap `_ +understanding. For holistic Airship deployment procedures, refer to `Treasuremap `_ Basic Deployment ---------------- @@ -58,7 +58,7 @@ Perform the following steps to execute the deployment: 3. Nodes for which ``join-.sh`` scripts have been generated should be provisioned at this point, and need to have network connectivity to the genesis node. (This could be a manual Ubuntu provision, or a Drydock- - initiated PXE boot in the case of a full fledged UCP deployment). + initiated PXE boot in the case of a full fledged Airship deployment). 4. Join master nodes by copying their respective ``join-.sh`` scripts to them and running them. 5. Validate the master nodes by copying and running their respective diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index 48fb9b91..6e6463ff 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -86,7 +86,7 @@ metadata: layer: site storagePolicy: cleartext data: - description: UCP platform components + description: Airship platform components sequenced: true chart_group: - promenade diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index 6600d922..276db314 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -101,7 +101,7 @@ metadata: layer: site storagePolicy: cleartext data: - description: UCP Infrastructure + description: Airship Infrastructure sequenced: false chart_group: - ucp-mariadb @@ -123,7 +123,7 @@ metadata: layer: site storagePolicy: cleartext data: - description: UCP platform components + description: Airship platform components chart_group: - armada - deckhand diff --git a/promenade/utils/success_message.py b/promenade/utils/success_message.py index d873d1b2..9e4b62b3 100644 --- a/promenade/utils/success_message.py +++ b/promenade/utils/success_message.py @@ -18,7 +18,7 @@ from promenade.utils.message import Message class SuccessMessage(Message): - """SuccessMessage per UCP convention: + """SuccessMessage per Airship convention: https://airshipit.readthedocs.io/en/latest/api-conventions.html#status-responses """ diff --git a/promenade/utils/validation_message.py b/promenade/utils/validation_message.py index dace1590..cbc6d0dd 100644 --- a/promenade/utils/validation_message.py +++ b/promenade/utils/validation_message.py @@ -19,8 +19,8 @@ from promenade.utils.message import Message class ValidationMessage(Message): - """ ValidationMessage per UCP convention: - https://github.com/att-comdev/ucp-integration/blob/master/docs/source/api-conventions.rst#output-structure # noqa + """ ValidationMessage per Airship convention: + https://github.com/openstack/airship-in-a-bottle/blob/master/doc/source/api-conventions.rst#output-structure # noqa Construction of ValidationMessage message: diff --git a/setup.py b/setup.py index bcdbd40d..de6c01cf 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright 2017 The Promenade Authors. +# Copyright 2017 AT&T Intellectual Property. All other rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ setup( name='promenade', version='0.8.0', packages=['promenade'], + description=('Promenade is a tool for bootstrapping a resilient ' + 'Kubernetes cluster and managing its life-cycle via Helm charts.'), + url='https://github.com/openstack/airship-promenade', + author='The Airship Authors', + license='Apache 2.0', package_data={ 'schemas': 'schemas/*', 'templates': 'templates/*', diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index ace41f9c..e1fb113c 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -86,7 +86,7 @@ metadata: layer: site storagePolicy: cleartext data: - description: UCP platform components + description: Airship platform components sequenced: true chart_group: - promenade diff --git a/tools/gate/config-templates/bootstrap-armada-config.yaml b/tools/gate/config-templates/bootstrap-armada-config.yaml index d32ba6e0..5461f868 100644 --- a/tools/gate/config-templates/bootstrap-armada-config.yaml +++ b/tools/gate/config-templates/bootstrap-armada-config.yaml @@ -67,7 +67,7 @@ metadata: layer: site storagePolicy: cleartext data: - description: UCP Services + description: Airship Services chart_group: - promenade ---