diff --git a/README.rst b/README.rst index 55e0f41f9..1ca86ab25 100644 --- a/README.rst +++ b/README.rst @@ -43,8 +43,8 @@ Launchpad Projects Code Repository --------------- -- Server: https://git.openstack.org/cgit/stackforge/senlin -- Client: https://git.openstack.org/cgit/stackforge/python-senlinclient +- Server: https://git.openstack.org/cgit/openstack/senlin +- Client: https://git.openstack.org/cgit/openstack/python-senlinclient Blueprints ---------- diff --git a/devstack/README.rst b/devstack/README.rst index 44482ecd8..2235126d0 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -1,17 +1,15 @@ -==================== -Devstack Integration -==================== +=========================== +Enabling senlin in DevStack +=========================== -This directory contains the files necessary to integrate Senlin with devstack. +1. Download DevStack:: -Refer the quickstart guide for more information on using devstack and senlin. + git clone https://git.openstack.org/openstack-dev/devstack + cd devstack -To install senlin into devstack, add the following settings to enable senlin plugin: :: +2. Add this repo as an external repository into your ``local.conf`` file:: [[local|localrc]] - enable_plugin senlin https://git.openstack.org/stackforge/senlin + enable_plugin senlin https://git.openstack.org/openstack/senlin -Run devstack as normal: :: - - cd /opt/stack/devstack - ./stack.sh +3. Run ``stack.sh``. diff --git a/devstack/lib/senlin b/devstack/lib/senlin index 2170c6010..210d9dca7 100644 --- a/devstack/lib/senlin +++ b/devstack/lib/senlin @@ -38,11 +38,11 @@ SENLIN_API_HOST=${SENLIN_API_HOST:-$HOST_IP} SENLIN_API_PORT=${SENLIN_API_PORT:-8778} SENLIN_DIR=$DEST/senlin -SENLIN_REPO=${SENLIN_REPO:-${GIT_BASE}/stackforge/senlin.git} +SENLIN_REPO=${SENLIN_REPO:-${GIT_BASE}/openstack/senlin.git} SENLIN_BRANCH=${SENLIN_BRANCH:-master} SENLINCLIENT_DIR=$DEST/python-senlinclient -SENLINCLIENT_REPO=${SENLINCLIENT_REPO:-${GIT_BASE}/stackforge/python-senlinclient.git} +SENLINCLIENT_REPO=${SENLINCLIENT_REPO:-${GIT_BASE}/openstack/python-senlinclient.git} SENLINCLIENT_BRANCH=${SENLINCLIENT_BRANCH:-master} diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index 98b79856f..a6667259e 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -44,7 +44,7 @@ Install Senlin Server :: $ cd /opt/stack - $ git clone http://git.openstack.org/stackforge/senlin.git + $ git clone http://git.openstack.org/openstack/senlin.git 2. Install Senlin with required packages @@ -131,7 +131,7 @@ Install Senlin Client :: $ cd /opt/stack - $ git clone http://git.openstack.org/stackforge/python-senlinclient.git + $ git clone http://git.openstack.org/openstack/python-senlinclient.git 2. Install senlin client.