Remove references to old git repos

This removes references to the old att-comdev git repos, either updating
to the openstack github mirror or deleting as appropriate. Old project
name (UCP) references are left alone for now.

Change-Id: I53b294a3c574fa0bca4037e5e00ad31d92f26977
This commit is contained in:
Sean Eagan 2018-05-24 16:06:31 -05:00
parent c59f261e03
commit fe310b194e
13 changed files with 23 additions and 35 deletions

View File

@ -48,13 +48,6 @@ Armada consists of two separate but complementary components:
* Limiting projects to specific `Tiller`_ functionality by leveraging * Limiting projects to specific `Tiller`_ functionality by leveraging
project-scoping provided by `Keystone`_. project-scoping provided by `Keystone`_.
Roadmap
-------
Detailed roadmap can be viewed `here <https://github.com/att-comdev/armada/milestones>`_.
Issues can be reported `on GitHub <https://github.com/att-comdev/armada/issues>`_.
Installation Installation
------------ ------------
@ -113,7 +106,7 @@ In addition, Armada's API component has the following integration points:
Further Reading Further Reading
--------------- ---------------
`Undercloud Platform (UCP) <https://github.com/att-comdev/ucp-integration>`_. `Airship <https://airshipit.org>`_.
.. _Manual Install Guide: http://armada-helm.readthedocs.io/en/latest/development/getting-started.html#developer-install-guide .. _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 .. _Armada Quickstart: http://armada-helm.readthedocs.io/en/latest/operations/guide-use-armada.html

View File

@ -57,14 +57,14 @@ class GitTestCase(base.ArmadaTestCase):
@testtools.skipUnless( @testtools.skipUnless(
is_connected(), 'git clone requires network connectivity.') is_connected(), 'git clone requires network connectivity.')
def test_git_clone_good_url(self): 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) git_dir = source.git_clone(url)
self._validate_git_clone(git_dir) self._validate_git_clone(git_dir)
@testtools.skipUnless( @testtools.skipUnless(
is_connected(), 'git clone requires network connectivity.') is_connected(), 'git clone requires network connectivity.')
def test_git_clone_commit(self): def test_git_clone_commit(self):
url = 'http://github.com/att-comdev/armada' url = 'https://github.com/openstack/airship-armada'
commit = 'cba78d1d03e4910f6ab1691bae633c5bddce893d' commit = 'cba78d1d03e4910f6ab1691bae633c5bddce893d'
git_dir = source.git_clone(url, commit) git_dir = source.git_clone(url, commit)
self._validate_git_clone(git_dir) self._validate_git_clone(git_dir)
@ -91,7 +91,7 @@ class GitTestCase(base.ArmadaTestCase):
@testtools.skipUnless( @testtools.skipUnless(
is_connected(), 'git clone requires network connectivity.') is_connected(), 'git clone requires network connectivity.')
def test_git_clone_bad_url(self): def test_git_clone_bad_url(self):
url = 'http://github.com/dummy/armada' url = 'https://github.com/dummy/armada'
self.assertRaises(source_exceptions.GitException, self.assertRaises(source_exceptions.GitException,
source.git_clone, url) source.git_clone, url)
@ -102,7 +102,7 @@ class GitTestCase(base.ArmadaTestCase):
@testtools.skipUnless( @testtools.skipUnless(
is_connected(), 'git clone requires network connectivity.') is_connected(), 'git clone requires network connectivity.')
def test_git_clone_fake_proxy(self): 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( proxy_url = test_utils.rand_name(
'not.a.proxy.that.works.and.never.will', 'not.a.proxy.that.works.and.never.will',
prefix='http://') + ":8080" prefix='http://') + ":8080"
@ -165,7 +165,7 @@ class GitTestCase(base.ArmadaTestCase):
is_connected(), 'git clone requires network connectivity.') is_connected(), 'git clone requires network connectivity.')
@mock.patch.object(source, 'LOG') @mock.patch.object(source, 'LOG')
def test_source_cleanup(self, mock_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) git_path = source.git_clone(url)
source.source_cleanup(git_path) source.source_cleanup(git_path)
mock_log.warning.assert_not_called() 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): def test_git_clone_ssh_auth_method_fails_auth(self, mock_os):
mock_os.path.exists.return_value = True mock_os.path.exists.return_value = True
fake_user = test_utils.rand_name('fake_user') 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) % fake_user)
self.assertRaises( self.assertRaises(
source_exceptions.GitAuthException, source.git_clone, url, 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): def test_git_clone_ssh_auth_method_missing_ssh_key(self, mock_os):
mock_os.path.exists.return_value = False mock_os.path.exists.return_value = False
fake_user = test_utils.rand_name('fake_user') 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) % fake_user)
self.assertRaises( self.assertRaises(
source_exceptions.GitSSHException, source.git_clone, url, source_exceptions.GitSSHException, source.git_clone, url,

View File

@ -214,8 +214,8 @@ data:
def test_validate_manifest_url(self): def test_validate_manifest_url(self):
value = 'url' value = 'url'
self.assertFalse(validate.validate_manifest_url(value)) self.assertFalse(validate.validate_manifest_url(value))
value = 'https://raw.githubusercontent.com/att-comdev/' \ value = 'https://raw.githubusercontent.com/openstack/' \
'armada/master/examples/simple.yaml' 'airship-armada/master/examples/simple.yaml'
self.assertTrue(validate.validate_manifest_url(value)) self.assertTrue(validate.validate_manifest_url(value))
def test_validate_manifest_filepath(self): def test_validate_manifest_filepath(self):

View File

@ -17,7 +17,7 @@ import json
class ValidationMessage(object): class ValidationMessage(object):
""" ValidationMessage per UCP convention: """ 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: Construction of ValidationMessage message:

View File

@ -20,8 +20,5 @@ keywords:
- armada - armada
home: http://armada-helm.readthedocs.io/en/latest/ home: http://armada-helm.readthedocs.io/en/latest/
sources: sources:
- https://github.com/att-comdev/armada - https://github.com/openstack/airship-armada
- https://github.com/att-comdev/aic-helm
maintainers:
- name: att-comdev
engine: gotpl engine: gotpl

View File

@ -21,6 +21,4 @@ keywords:
home: https://docs.helm.sh/ home: https://docs.helm.sh/
sources: sources:
- https://github.com/kubernetes/helm - https://github.com/kubernetes/helm
maintainers:
- name: att-comdev
engine: gotpl engine: gotpl

View File

@ -13,12 +13,12 @@ Quick Start (via Container)
To use the docker container to develop: To use the docker container to develop:
#. Clone the `Armada repository <http://github.com/att-comdev/armada>`_. #. Clone the `Armada repository <http://github.com/openstack/airship-armada>`_.
#. ``cd`` into the cloned directory. #. ``cd`` into the cloned directory.
.. code-block:: bash .. 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 #. Next, run the following commands to install ``tox``, generate sample policy
and configuration files, and build Armada charts as well as the Armada 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:: 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:: It is recommended that Armada be run inside a virtual environment. To do so::

View File

@ -463,4 +463,4 @@ References
~~~~~~~~~~ ~~~~~~~~~~
For working examples please check the examples in our repo For working examples please check the examples in our repo
`here <https://github.com/att-comdev/armada/tree/master/examples>`__ `here <https://github.com/openstack/airship-armada/tree/master/examples>`__

View File

@ -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** **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 helm plugin install ~/.helm/plugins/armada
Usage Usage

View File

@ -53,5 +53,5 @@ Issue
----- -----
If the issue that you are having does not appear here please check the Armada If the issue that you are having does not appear here please check the Armada
issues `section <https://github.com/att-comdev/armada/issues>`_. If the issue does issues `section <https://github.com/openstack/airship-armada/issues>`_. If the issue does
not exist, please create an issue. not exist, please create an issue.

View File

@ -36,7 +36,7 @@ Usage
Build: 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 docker build . -t quay.io/attcomdev/armada:latest
2. Running Armada 2. Running Armada
@ -52,7 +52,7 @@ Usage
To run you custom Armada.yamls you need to mount them into the container as To run you custom Armada.yamls you need to mount them into the container as
shown below. shown below.
This example is using ``examples/`` directory in armada `repo <https://github.com/att-comdev/armada/tree/master/examples>`_ This example is using ``examples/`` directory in armada `repo <https://github.com/openstack/airship-armada/tree/master/examples>`_
.. code:: bash .. code:: bash

View File

@ -10,7 +10,7 @@ info:
charts using a single command. charts using a single command.
contact: contact:
name: Armada Github Repository name: Armada Github Repository
url: https://github.com/att-comdev/armada url: https://github.com/openstack/airship-armada
license: license:
name: Apache 2.0 name: Apache 2.0
url: http://www.apache.org/licenses/LICENSE-2.0.html url: http://www.apache.org/licenses/LICENSE-2.0.html

View File

@ -7,7 +7,7 @@ info:
charts using a single command. charts using a single command.
contact: contact:
name: Armada Github Repository name: Armada Github Repository
url: https://github.com/att-comdev/armada url: https://github.com/openstack/airship-armada
license: license:
name: Apache 2.0 name: Apache 2.0
url: http://www.apache.org/licenses/LICENSE-2.0.html url: http://www.apache.org/licenses/LICENSE-2.0.html