diff --git a/README.rst b/README.rst index f800c4945b..6066e200f7 100644 --- a/README.rst +++ b/README.rst @@ -13,16 +13,16 @@ Getting Started If you'd like to run from the master branch, you can clone the git repo: - git clone git@github.com:openstack/heat.git + git clone git://git.openstack.org/openstack/heat.git * Wiki: http://wiki.openstack.org/Heat * Developer docs: http://docs.openstack.org/developer/heat -* Template samples: https://github.com/openstack/heat-templates +* Template samples: https://git.openstack.org/cgit/openstack/heat-templates Python client ------------- -https://github.com/openstack/python-heatclient +https://git.openstack.org/cgit/openstack/python-heatclient References ---------- @@ -33,18 +33,19 @@ References We have integration with ------------------------ -* https://github.com/openstack/python-novaclient (instance) -* https://github.com/openstack/python-keystoneclient (auth) -* https://github.com/openstack/python-swiftclient (s3) -* https://github.com/openstack/python-neutronclient (networking) -* https://github.com/openstack/python-ceilometerclient (metering) -* https://github.com/openstack/python-cinderclient (storage service) -* https://github.com/openstack/python-glanceclient (image service) -* https://github.com/openstack/python-troveclient (database as a Service) -* https://github.com/openstack/python-saharaclient (hadoop cluster) -* https://github.com/openstack/python-barbicanclient (key management service) -* https://github.com/openstack/python-designateclient (DNS service) -* https://github.com/openstack/python-magnumclient (container service) -* https://github.com/openstack/python-manilaclient (shared file system service) -* https://github.com/openstack/python-mistralclient (workflow service) -* https://github.com/openstack/python-zaqarclient (messaging service) +* https://git.openstack.org/cgit/openstack/python-novaclient (instance) +* https://git.openstack.org/cgit/openstack/python-keystoneclient (auth) +* https://git.openstack.org/cgit/openstack/python-swiftclient (s3) +* https://git.openstack.org/cgit/openstack/python-neutronclient (networking) +* https://git.openstack.org/cgit/openstack/python-ceilometerclient (metering) +* https://git.openstack.org/cgit/openstack/python-cinderclient (storage service) +* https://git.openstack.org/cgit/openstack/python-glanceclient (image service) +* https://git.openstack.org/cgit/openstack/python-troveclient (database as a Service) +* https://git.openstack.org/cgit/openstack/python-saharaclient (hadoop cluster) +* https://git.openstack.org/cgit/openstack/python-barbicanclient (key management service) +* https://git.openstack.org/cgit/openstack/python-designateclient (DNS service) +* https://git.openstack.org/cgit/openstack/python-magnumclient (container service) +* https://git.openstack.org/cgit/openstack/python-manilaclient (shared file system service) +* https://git.openstack.org/cgit/openstack/python-mistralclient (workflow service) +* https://git.openstack.org/cgit/openstack/python-zaqarclient (messaging service) +* https://git.openstack.org/cgit/openstack/python-monascaclient (monitoring service) diff --git a/doc/docbkx/api-ref/src/wadls/heat-api/src/README.rst b/doc/docbkx/api-ref/src/wadls/heat-api/src/README.rst index 3bb041e6e8..3ea9ce1f57 100644 --- a/doc/docbkx/api-ref/src/wadls/heat-api/src/README.rst +++ b/doc/docbkx/api-ref/src/wadls/heat-api/src/README.rst @@ -5,5 +5,4 @@ HEAT wadl The original heat wadl (heat-api-1.0.wadl) and the samples have now been deleted from this repository. The wadl has been renamed and migrated to the following repo location along with the samples: -https://github.com/openstack/api-site/blob/master/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl - +https://git.openstack.org/cgit/openstack/api-site/tree/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl diff --git a/doc/source/getting_started/jeos_building.rst b/doc/source/getting_started/jeos_building.rst index 373a8d058b..bd9bf31eb4 100644 --- a/doc/source/getting_started/jeos_building.rst +++ b/doc/source/getting_started/jeos_building.rst @@ -18,7 +18,7 @@ the heat-cfntools_ package installed. This document describes some options for creating a heat-cfntools enabled image for yourself. -.. _heat-cfntools: https://github.com/openstack/heat-cfntools +.. _heat-cfntools: https://git.openstack.org/cgit/openstack/heat-cfntools Building an image with diskimage-builder ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -27,14 +27,14 @@ tripleo-image-elements_ is a collection of diskimage-builder elements related to the TripleO_ project. It includes an element for heat-cfntools which can be used to create heat-enabled images. -.. _diskimage-builder: https://github.com/openstack/diskimage-builder -.. _tripleo-image-elements: https://github.com/openstack/tripleo-image-elements +.. _diskimage-builder: https://git.openstack.org/cgit/openstack/diskimage-builder +.. _tripleo-image-elements: https://git.openstack.org/cgit/openstack/tripleo-image-elements .. _TripleO: https://wiki.openstack.org/wiki/TripleO Install the tool (preferably in a virtualenv) and fetch the elements:: - pip install git+https://github.com/openstack/diskimage-builder.git - git clone https://github.com/openstack/tripleo-image-elements.git + pip install git+git://git.openstack.org/openstack/diskimage-builder.git + git clone git://git.openstack.org/openstack/tripleo-image-elements.git To create a heat-cfntools enabled image with the current release of Fedora x86_64:: @@ -63,9 +63,9 @@ package download failure causing the stack launch to fail. To create an image that contains hooks needed for SoftwareConfig and SoftwareDeployment, you can follow the steps bellow to build a fedora based image:: - pip install git+https://git.openstack.org/openstack/diskimage-builder.git - git clone https://git.openstack.org/openstack/tripleo-image-elements.git - git clone https://git.openstack.org/openstack/heat-templates.git + pip install git+git://git.openstack.org/openstack/diskimage-builder.git + git clone git://git.openstack.org/openstack/tripleo-image-elements.git + git clone git://git.openstack.org/openstack/heat-templates.git export ELEMENTS_PATH=tripleo-image-elements/elements:heat-templates/hot/software-config/elements disk-image-create vm \ fedora selinux-permissive \ diff --git a/doc/source/scale_deployment.rst b/doc/source/scale_deployment.rst index c10d707f3f..734d55948b 100644 --- a/doc/source/scale_deployment.rst +++ b/doc/source/scale_deployment.rst @@ -256,7 +256,11 @@ Running the API and Engine Services For each machine, B and C, you must do the following steps: - 1. Clone the heat repository https://github.com/openstack/heat; + 1. Clone the heat repository https://git.openstack.org/cgit/openstack/heat, run: + + :: + git clone git://git.openstack.org/openstack/heat.git + 2. Create a local copy of the configuration file */etc/heat/heat.conf* from the machine A; 3. Make required changes on the configuration file; diff --git a/doc/source/template_guide/contrib.rst b/doc/source/template_guide/contrib.rst index 4bf259c0a9..56dc594b61 100644 --- a/doc/source/template_guide/contrib.rst +++ b/doc/source/template_guide/contrib.rst @@ -33,7 +33,7 @@ Rackspace resources depend on the dev branch of `pyrax `_ to work properly. More information about them can be found in the `RACKSPACE_README -`_. +`_. .. contribrespages:: Rackspace:: @@ -47,6 +47,6 @@ DockerInc Resource This plugin enables the use of Docker containers in a Heat template and requires the `docker-py `_ package. You can find more information in the `DOCKER_README -`_. +`_. .. contribrespages:: DockerInc:: diff --git a/doc/source/template_guide/software_deployment.rst b/doc/source/template_guide/software_deployment.rst index 7c35a374d0..eb8331f0f3 100644 --- a/doc/source/template_guide/software_deployment.rst +++ b/doc/source/template_guide/software_deployment.rst @@ -788,14 +788,14 @@ contents of the file ``example-puppet-manifest.pp``, containing: .. _`AWS::CloudFormation::Init`: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-init.html -.. _diskimage-builder: https://github.com/openstack/diskimage-builder +.. _diskimage-builder: https://git.openstack.org/cgit/openstack/diskimage-builder .. _imagefactory: http://imgfac.org/ .. _`Metadata service`: http://docs.openstack.org/admin-guide-cloud/compute-networking-nova.html#metadata-service .. _Cloud-init: http://cloudinit.readthedocs.org/en/latest/ .. _curl: http://curl.haxx.se/ .. _`Orchestration API`: http://developer.openstack.org/api-ref-orchestration-v1.html -.. _os-refresh-config: https://github.com/openstack/os-refresh-config -.. _os-apply-config: https://github.com/openstack/os-apply-config -.. _tripleo-heat-templates: https://github.com/openstack/tripleo-heat-templates -.. _tripleo-image-elements: https://github.com/openstack/tripleo-image-elements +.. _os-refresh-config: https://git.openstack.org/cgit/openstack/os-refresh-config +.. _os-apply-config: https://git.openstack.org/cgit/openstack/os-apply-config +.. _tripleo-heat-templates: https://git.openstack.org/cgit/openstack/tripleo-heat-templates +.. _tripleo-image-elements: https://git.openstack.org/cgit/openstack/tripleo-image-elements .. _puppet: http://puppetlabs.com/ diff --git a/doc/source/templates/cfn/WordPress_Single_Instance.rst b/doc/source/templates/cfn/WordPress_Single_Instance.rst index 2a7c68630f..02ca43b875 100644 --- a/doc/source/templates/cfn/WordPress_Single_Instance.rst +++ b/doc/source/templates/cfn/WordPress_Single_Instance.rst @@ -13,7 +13,7 @@ AWS Wordpress Single Instance Template -------------------------------------- -https://github.com/openstack/heat-templates/blob/master/cfn/F18/WordPress_Single_Instance.template +https://git.openstack.org/cgit/openstack/heat-templates/tree/cfn/F18/WordPress_Single_Instance.template Description ----------- diff --git a/doc/source/templates/hot/hello_world.rst b/doc/source/templates/hot/hello_world.rst index 8cff0adbf1..565cb5ec5a 100644 --- a/doc/source/templates/hot/hello_world.rst +++ b/doc/source/templates/hot/hello_world.rst @@ -13,7 +13,7 @@ Hello World HOT Template ------------------------ -https://github.com/openstack/heat-templates/blob/master/hot/hello_world.yaml +https://git.openstack.org/cgit/openstack/heat-templates/tree/hot/hello_world.yaml Description ----------- diff --git a/doc/source/templates/index.rst b/doc/source/templates/index.rst index b482fd4de4..bba67fd85f 100644 --- a/doc/source/templates/index.rst +++ b/doc/source/templates/index.rst @@ -11,7 +11,7 @@ License for the specific language governing permissions and limitations under the License. -This page documents the templates at https://github.com/openstack/heat-templates/ +This page documents the templates at https://git.openstack.org/cgit/openstack/heat-templates/ Example HOT Templates ===================== diff --git a/rally-scenarios/plugins/sample_plugin.py b/rally-scenarios/plugins/sample_plugin.py index 13e581a686..16e98616e2 100644 --- a/rally-scenarios/plugins/sample_plugin.py +++ b/rally-scenarios/plugins/sample_plugin.py @@ -16,7 +16,7 @@ """Sample plugin for Heat. For more Heat related benchmarks take a look here: -http://github.com/openstack/rally/tree/master/rally/plugins/openstack/scenarios/heat +https://git.openstack.org/cgit/openstack/rally/tree/rally/plugins/openstack/scenarios/heat About plugins: https://rally.readthedocs.org/en/latest/plugins.html