openstack
/
octavia
Code Issues Proposed changes

Updates for repo rename stackforge->openstack 

Updated files to use openstack instead of stackforge
Updated devstack samples to not point to old references

Change-Id: I501d76173475bb1619006819d971493854fdd15c
This commit is contained in:
Michael Johnson 2015-06-13 00:16:51 +00:00
parent 452cec9ae2
commit e6cb590fdd
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/README.md
View File

@ -18,7 +18,7 @@ where
For example For example
enable_plugin octavia https://git.openstack.org/stackforge/octavia master enable_plugin octavia https://git.openstack.org/openstack/octavia master
2) Enable the LBaaS Version 2 and Octavia services 2) Enable the LBaaS Version 2 and Octavia services

6
devstack/samples/Vagrantfile vendored
View File

@ -71,10 +71,8 @@ Vagrant.configure(2) do |config|
sudo apt-get -y install git sudo apt-get -y install git
git clone https://git.openstack.org/openstack-dev/devstack git clone https://git.openstack.org/openstack-dev/devstack
git clone https://git.openstack.org/stackforge/octavia git clone https://git.openstack.org/openstack/octavia
cd octavia cd octavia/devstack/samples
git fetch https://review.openstack.org/stackforge/octavia refs/changes/96/167796/26 && git checkout FETCH_HEAD
cd devstack/samples
cp local.* webserver.sh ~/devstack cp local.* webserver.sh ~/devstack
cd ~/devstack cd ~/devstack
./stack.sh ./stack.sh

4
devstack/samples/local.conf
View File

@ -21,7 +21,7 @@ RECLONE=True
# Load the external LBaaS plugin. # Load the external LBaaS plugin.
enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas
enable_plugin octavia https://git.openstack.org/stackforge/octavia refs/changes/96/167796/27 enable_plugin octavia https://git.openstack.org/openstack/octavia
LIBS_FROM_GIT+=python-neutronclient LIBS_FROM_GIT+=python-neutronclient
DATABASE_PASSWORD=password DATABASE_PASSWORD=password
@ -83,7 +83,7 @@ Q_PLUGIN=ml2
Q_ML2_TENANT_NETWORK_TYPE=vxlan Q_ML2_TENANT_NETWORK_TYPE=vxlan
Q_DVR_MODE=dvr_snat Q_DVR_MODE=dvr_snat
IMAGE_URLS+=",https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" IMAGE_URLS+=",http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img"
LOGFILE=$DEST/logs/stack.sh.log LOGFILE=$DEST/logs/stack.sh.log

4
diskimage-create/README.rst
View File

@ -32,7 +32,7 @@ git repositories one directory above the Octavia git repository.
| /<some directory>/tripleo-image-elements | /<some directory>/tripleo-image-elements
| cd /<some directory> | cd /<some directory>
| git clone https://github.com/stackforge/octavia.git | git clone https://github.com/openstack/octavia.git
| git clone https://git.openstack.org/openstack/diskimage-builder.git | git clone 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/tripleo-image-elements.git
@ -160,7 +160,7 @@ ELEMENTS_REPO_PATH
OCTAVIA_REPO_PATH OCTAVIA_REPO_PATH
- Directory containing octavia - Directory containing octavia
- <directory above the script location> - <directory above the script location>
- Reference: https://github.com/stackforge/octavia - Reference: https://github.com/openstack/octavia
Container Support Container Support
================= =================

2
elements/amphora-agent/source-repository-amphora-agent
View File

@ -1,2 +1,2 @@
# This is temporary until we have a pip package # This is temporary until we have a pip package
amphora-agent git /opt/amphora-agent https://review.openstack.org/stackforge/octavia amphora-agent git /opt/amphora-agent https://review.openstack.org/openstack/octavia