diff --git a/README.rst b/README.rst index 77a0a140..8e2ca23e 100644 --- a/README.rst +++ b/README.rst @@ -48,13 +48,6 @@ Armada consists of two separate but complementary components: * Limiting projects to specific `Tiller`_ functionality by leveraging project-scoping provided by `Keystone`_. -Roadmap -------- - -Detailed roadmap can be viewed `here `_. - -Issues can be reported `on GitHub `_. - Installation ------------ @@ -113,7 +106,7 @@ In addition, Armada's API component has the following integration points: Further Reading --------------- -`Undercloud Platform (UCP) `_. +`Airship `_. .. _Manual Install Guide: http://armada-helm.readthedocs.io/en/latest/development/getting-started.html#developer-install-guide .. _Armada Quickstart: http://armada-helm.readthedocs.io/en/latest/operations/guide-use-armada.html diff --git a/armada/tests/unit/utils/test_source.py b/armada/tests/unit/utils/test_source.py index caa6968b..7c7601e9 100644 --- a/armada/tests/unit/utils/test_source.py +++ b/armada/tests/unit/utils/test_source.py @@ -57,14 +57,14 @@ class GitTestCase(base.ArmadaTestCase): @testtools.skipUnless( is_connected(), 'git clone requires network connectivity.') def test_git_clone_good_url(self): - url = 'http://github.com/att-comdev/armada' + url = 'https://github.com/openstack/airship-armada' git_dir = source.git_clone(url) self._validate_git_clone(git_dir) @testtools.skipUnless( is_connected(), 'git clone requires network connectivity.') def test_git_clone_commit(self): - url = 'http://github.com/att-comdev/armada' + url = 'https://github.com/openstack/airship-armada' commit = 'cba78d1d03e4910f6ab1691bae633c5bddce893d' git_dir = source.git_clone(url, commit) self._validate_git_clone(git_dir) @@ -91,7 +91,7 @@ class GitTestCase(base.ArmadaTestCase): @testtools.skipUnless( is_connected(), 'git clone requires network connectivity.') def test_git_clone_bad_url(self): - url = 'http://github.com/dummy/armada' + url = 'https://github.com/dummy/armada' self.assertRaises(source_exceptions.GitException, source.git_clone, url) @@ -102,7 +102,7 @@ class GitTestCase(base.ArmadaTestCase): @testtools.skipUnless( is_connected(), 'git clone requires network connectivity.') def test_git_clone_fake_proxy(self): - url = 'http://github.com/att-comdev/armada' + url = 'https://github.com/openstack/airship-armada' proxy_url = test_utils.rand_name( 'not.a.proxy.that.works.and.never.will', prefix='http://') + ":8080" @@ -165,7 +165,7 @@ class GitTestCase(base.ArmadaTestCase): is_connected(), 'git clone requires network connectivity.') @mock.patch.object(source, 'LOG') def test_source_cleanup(self, mock_log): - url = 'http://github.com/att-comdev/armada' + url = 'https://github.com/openstack/airship-armada' git_path = source.git_clone(url) source.source_cleanup(git_path) mock_log.warning.assert_not_called() @@ -212,7 +212,7 @@ class GitTestCase(base.ArmadaTestCase): def test_git_clone_ssh_auth_method_fails_auth(self, mock_os): mock_os.path.exists.return_value = True fake_user = test_utils.rand_name('fake_user') - url = ('ssh://%s@review.gerrithub.io:29418/att-comdev/armada' + url = ('ssh://%s@review.openstack.org:29418/openstack/airship-armada' % fake_user) self.assertRaises( source_exceptions.GitAuthException, source.git_clone, url, @@ -225,7 +225,7 @@ class GitTestCase(base.ArmadaTestCase): def test_git_clone_ssh_auth_method_missing_ssh_key(self, mock_os): mock_os.path.exists.return_value = False fake_user = test_utils.rand_name('fake_user') - url = ('ssh://%s@review.gerrithub.io:29418/att-comdev/armada' + url = ('ssh://%s@review.openstack.org:29418/openstack/airship-armada' % fake_user) self.assertRaises( source_exceptions.GitSSHException, source.git_clone, url, diff --git a/armada/tests/unit/utils/test_validate.py b/armada/tests/unit/utils/test_validate.py index 9b7be002..4dc03262 100644 --- a/armada/tests/unit/utils/test_validate.py +++ b/armada/tests/unit/utils/test_validate.py @@ -214,8 +214,8 @@ data: def test_validate_manifest_url(self): value = 'url' self.assertFalse(validate.validate_manifest_url(value)) - value = 'https://raw.githubusercontent.com/att-comdev/' \ - 'armada/master/examples/simple.yaml' + value = 'https://raw.githubusercontent.com/openstack/' \ + 'airship-armada/master/examples/simple.yaml' self.assertTrue(validate.validate_manifest_url(value)) def test_validate_manifest_filepath(self): diff --git a/armada/utils/validation_message.py b/armada/utils/validation_message.py index 2c36bd19..f1105746 100644 --- a/armada/utils/validation_message.py +++ b/armada/utils/validation_message.py @@ -17,7 +17,7 @@ import json class ValidationMessage(object): """ ValidationMessage per UCP convention: - https://github.com/att-comdev/ucp-integration/blob/master/docs/source/api-conventions.rst#output-structure # noqa + https://airshipit.readthedocs.io/en/latest/api-conventions.html#output-structure # noqa Construction of ValidationMessage message: diff --git a/charts/armada/Chart.yaml b/charts/armada/Chart.yaml index 7c52b3f3..f87d3b3d 100644 --- a/charts/armada/Chart.yaml +++ b/charts/armada/Chart.yaml @@ -20,8 +20,5 @@ keywords: - armada home: http://armada-helm.readthedocs.io/en/latest/ sources: -- https://github.com/att-comdev/armada -- https://github.com/att-comdev/aic-helm -maintainers: -- name: att-comdev +- https://github.com/openstack/airship-armada engine: gotpl diff --git a/charts/tiller/Chart.yaml b/charts/tiller/Chart.yaml index 2355be5d..bef35d24 100644 --- a/charts/tiller/Chart.yaml +++ b/charts/tiller/Chart.yaml @@ -21,6 +21,4 @@ keywords: home: https://docs.helm.sh/ sources: - https://github.com/kubernetes/helm -maintainers: -- name: att-comdev engine: gotpl diff --git a/doc/source/development/getting-started.rst b/doc/source/development/getting-started.rst index 41194d5f..39d266e9 100644 --- a/doc/source/development/getting-started.rst +++ b/doc/source/development/getting-started.rst @@ -13,12 +13,12 @@ Quick Start (via Container) To use the docker container to develop: -#. Clone the `Armada repository `_. +#. Clone the `Armada repository `_. #. ``cd`` into the cloned directory. .. code-block:: bash - $ git clone http://github.com/att-comdev/armada.git && cd armada + $ git clone http://github.com/openstack/airship-armada.git && cd airship-armada #. Next, run the following commands to install ``tox``, generate sample policy and configuration files, and build Armada charts as well as the Armada @@ -115,7 +115,7 @@ Follow the steps below to install the Armada CLI. Clone the Armada repository, ``cd`` into it:: - git clone http://github.com/att-comdev/armada.git && cd armada + git clone http://github.com/openstack/airship-armada.git && cd airship-armada It is recommended that Armada be run inside a virtual environment. To do so:: diff --git a/doc/source/operations/guide-build-armada-yaml.rst b/doc/source/operations/guide-build-armada-yaml.rst index 990adf8c..6102c9d6 100644 --- a/doc/source/operations/guide-build-armada-yaml.rst +++ b/doc/source/operations/guide-build-armada-yaml.rst @@ -463,4 +463,4 @@ References ~~~~~~~~~~ For working examples please check the examples in our repo -`here `__ +`here `__ diff --git a/doc/source/operations/guide-helm-plugin.rst b/doc/source/operations/guide-helm-plugin.rst index 93953098..5888dde3 100644 --- a/doc/source/operations/guide-helm-plugin.rst +++ b/doc/source/operations/guide-helm-plugin.rst @@ -10,13 +10,13 @@ Install Plugin :: - helm plugin install https://github.com/att-comdev/armada.git + helm plugin install https://github.com/openstack/airship-armada.git **Clone and install locally** :: - git clone https://github.com/att-comdev/armada.git ~/.helm/plugins/ + git clone https://github.com/openstack/airship-armada.git ~/.helm/plugins/ helm plugin install ~/.helm/plugins/armada Usage diff --git a/doc/source/operations/guide-troubleshooting.rst b/doc/source/operations/guide-troubleshooting.rst index a8fe5616..6c4f4585 100644 --- a/doc/source/operations/guide-troubleshooting.rst +++ b/doc/source/operations/guide-troubleshooting.rst @@ -53,5 +53,5 @@ Issue ----- If the issue that you are having does not appear here please check the Armada -issues `section `_. If the issue does +issues `section `_. If the issue does not exist, please create an issue. diff --git a/doc/source/operations/guide-use-armada.rst b/doc/source/operations/guide-use-armada.rst index a467795b..90d29473 100644 --- a/doc/source/operations/guide-use-armada.rst +++ b/doc/source/operations/guide-use-armada.rst @@ -36,7 +36,7 @@ Usage Build: - git clone https://github.com/att-comdev/armada && cd armada/ + git clone https://github.com/openstack/airship-armada && cd airship-armada/ docker build . -t quay.io/attcomdev/armada:latest 2. Running Armada @@ -52,7 +52,7 @@ Usage To run you custom Armada.yamls you need to mount them into the container as shown below. - This example is using ``examples/`` directory in armada `repo `_ + This example is using ``examples/`` directory in armada `repo `_ .. code:: bash diff --git a/swagger/swaggerV2-api.yaml b/swagger/swaggerV2-api.yaml index 27c650a2..0444dc41 100644 --- a/swagger/swaggerV2-api.yaml +++ b/swagger/swaggerV2-api.yaml @@ -10,7 +10,7 @@ info: charts using a single command. contact: name: Armada Github Repository - url: https://github.com/att-comdev/armada + url: https://github.com/openstack/airship-armada license: name: Apache 2.0 url: http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/swagger/swaggerV3-api.yaml b/swagger/swaggerV3-api.yaml index 194d2746..02d70614 100644 --- a/swagger/swaggerV3-api.yaml +++ b/swagger/swaggerV3-api.yaml @@ -7,7 +7,7 @@ info: charts using a single command. contact: name: Armada Github Repository - url: https://github.com/att-comdev/armada + url: https://github.com/openstack/airship-armada license: name: Apache 2.0 url: http://www.apache.org/licenses/LICENSE-2.0.html