diff --git a/README.md b/README.md
index 694803b80..caba584cd 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ The full API Specification can be found in [docs/monasca-api-spec.md](docs/monas
## Java Build
-Requires monasca-common from https://github.com/stackforge/monasca-common. Download and do mvn install. Then:
+Requires monasca-common from https://github.com/openstack/monasca-common. Download and do mvn install. Then:
```
cd java
diff --git a/common/build_common.sh b/common/build_common.sh
index 70801fe05..0e286811d 100755
--- a/common/build_common.sh
+++ b/common/build_common.sh
@@ -22,7 +22,7 @@ fi
# This should only be done on the stack forge system
if [ "${BUILD_COMMON}" = "true" ]; then
- git clone https://github.com/stackforge/monasca-common
+ git clone https://git.openstack.org/openstack/monasca-common
cd monasca-common
${MVN} clean
${MVN} install
diff --git a/devstack/README.txt b/devstack/README.txt
index 1badad296..b4fff5462 100644
--- a/devstack/README.txt
+++ b/devstack/README.txt
@@ -48,7 +48,7 @@ MONASCA_PERSISTER_IMPLEMENTATION_LANG=${MONASCA_PERSISTER_IMPLEMENTATION_LANG:-j
#MONASCA_PERSISTER_IMPLEMENTATION_LANG=${MONASCA_PERSISTER_IMPLEMENTATION_LANG:-python}
# This line will enable all of Monasca.
-enable_plugin monasca git://git.openstack.org/stackforge/monasca-api
+enable_plugin monasca git://git.openstack.org/openstack/monasca-api
# END DEVSTACK LOCAL.CONF CONTENTS
diff --git a/devstack/Vagrantfile b/devstack/Vagrantfile
index d76e7c583..a956ddaa3 100644
--- a/devstack/Vagrantfile
+++ b/devstack/Vagrantfile
@@ -80,7 +80,7 @@ Vagrant.configure(2) do |config|
sudo apt-get update
sudo apt-get -y upgrade
sudo apt-get -y install git
- git clone https://github.com/openstack-dev/devstack
+ git clone https://git.openstack.org/openstack-dev/devstack
cd devstack
git checkout stable/liberty
echo '[[local|localrc]]
@@ -107,7 +107,7 @@ MONASCA_PERSISTER_IMPLEMENTATION_LANG=${MONASCA_PERSISTER_IMPLEMENTATION_LANG:-j
#MONASCA_PERSISTER_IMPLEMENTATION_LANG=${MONASCA_PERSISTER_IMPLEMENTATION_LANG:-python}
# This line will enable all of Monasca.
-enable_plugin monasca git://git.openstack.org/stackforge/monasca-api
+enable_plugin monasca git://git.openstack.org/openstack/monasca-api
' > local.conf
./stack.sh
SHELL
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index f3899d007..5dd67c40c 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -23,7 +23,7 @@
# looks like
#
# [[local|localrc]]
-# enable_plugin monasca git://git.openstack.org/stackforge/monasca-api
+# enable_plugin monasca git://git.openstack.org/openstack/monasca-api
#
# By default all Monasca services are started (see
# devstack/settings). To disable a specific service use the
@@ -562,7 +562,7 @@ function install_monasca_common {
if [[ ! -d /opt/stack/monasca-common ]]; then
- sudo git clone https://github.com/stackforge/monasca-common.git /opt/stack/monasca-common
+ sudo git clone https://git.openstack.org/openstack/monasca-common.git /opt/stack/monasca-common
fi
@@ -728,7 +728,7 @@ function install_monasca_persister_java {
if [[ ! -d /opt/stack/monasca-persister ]]; then
- sudo git clone https://github.com/stackforge/monasca-persister /opt/stack/monasca-persister
+ sudo git clone https://git.openstack.org/openstack/monasca-persister /opt/stack/monasca-persister
fi
@@ -776,7 +776,7 @@ function install_monasca_persister_python {
if [[ ! -d /opt/stack/monasca-persister ]]; then
- sudo git clone https://github.com/stackforge/monasca-persister /opt/stack/monasca-persister
+ sudo git clone https://git.openstack.org/openstack/monasca-persister /opt/stack/monasca-persister
fi
@@ -879,7 +879,7 @@ function install_monasca_notification {
if [[ ! -d /opt/stack/monasca-notification ]]; then
- sudo git clone https://github.com/stackforge/monasca-notification /opt/stack/monasca-notification
+ sudo git clone https://git.openstack.org/openstack/monasca-notification /opt/stack/monasca-notification
fi
@@ -1050,7 +1050,7 @@ function install_monasca_thresh {
if [[ ! -d /opt/stack/monasca-thresh ]]; then
- sudo git clone https://github.com/stackforge/monasca-thresh.git /opt/stack/monasca-thresh
+ sudo git clone https://git.openstack.org/openstack/monasca-thresh.git /opt/stack/monasca-thresh
fi
@@ -1107,7 +1107,7 @@ function install_monasca_keystone_client {
if [[ ! -d /opt/stack/python-keystoneclient ]]; then
- sudo git clone https://github.com/openstack/python-keystoneclient /opt/stack/python-keystoneclient
+ sudo git clone https://git.openstack.org/openstack/python-keystoneclient /opt/stack/python-keystoneclient
fi
@@ -1147,7 +1147,7 @@ function install_monasca_agent {
if [[ ! -d /opt/stack/monasca-agent ]]; then
- sudo git clone https://github.com/stackforge/monasca-agent /opt/stack/monasca-agent
+ sudo git clone https://git.openstack.org/openstack/monasca-agent /opt/stack/monasca-agent
fi
diff --git a/monasca_tempest_tests/README.md b/monasca_tempest_tests/README.md
index 6a030c162..1e39744b7 100644
--- a/monasca_tempest_tests/README.md
+++ b/monasca_tempest_tests/README.md
@@ -5,7 +5,7 @@ Currently monasca-vagrant is used to run tests. This document will be updated wh
# Configuring to run the Monasca Tempest Tests
1. Clone the OpenStack Tempest repo, and cd to it.
```
- git clone https://github.com/openstack/tempest.git
+ git clone https://git.openstack.org/openstack/tempest.git
cd tempest
```
2. Create a virtualenv for running the Tempest tests and activate it. For example in the Tempest root dir
@@ -99,4 +99,4 @@ In particular, the Manila Tempest Tests were used as a reference implementation
# Issues
* Update documentation for testing using Devstack when available.
-* Consider changing from monasca_tempest_tests to monasca_api_tempest_tests.
\ No newline at end of file
+* Consider changing from monasca_tempest_tests to monasca_api_tempest_tests.
diff --git a/pom.xml b/pom.xml
index 178c0dae8..df3ff3d60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,8 @@
- scm:git:git@github.com:stackforge/monasca-api
- scm:git:git@github.com:stackforge/monasca-api
+ scm:git:git@github.com:openstack/monasca-api
+ scm:git:git@github.com:openstack/monasca-api