Browse Source

Use opendev repository

Change-Id: I4867dfd6b8883328551f6b07ae10feaf037dbe57
tags/7.0.0.0b1
Le Hou 7 months ago
parent
commit
ddf08fdf0a
13 changed files with 29 additions and 29 deletions
  1. +1
    -1
      README.rst
  2. +3
    -3
      devstack/README.rst
  3. +1
    -1
      devstack/computenode-local.conf.sample
  4. +1
    -1
      devstack/db-local.conf.sample
  5. +4
    -4
      devstack/local.conf.sample
  6. +2
    -2
      devstack/ovn-octavia-provider.conf.sample
  7. +2
    -2
      devstack/upgrade/settings
  8. +1
    -1
      devstack/vtep-local.conf.sample
  9. +9
    -9
      doc/source/contributor/testing.rst
  10. +1
    -1
      doc/source/contributor/vagrant/sparse-architecture.rst
  11. +1
    -1
      doc/source/index.rst
  12. +2
    -2
      doc/source/install/tripleo.rst
  13. +1
    -1
      tox.ini

+ 1
- 1
README.rst View File

@@ -7,7 +7,7 @@ vSwitch project. This project provides integration between OpenStack Neutron
and OVN.

* Free software: Apache license
* Source: https://git.openstack.org/cgit/openstack/networking-ovn
* Source: https://opendev.org/openstack/networking-ovn
* Bugs: https://bugs.launchpad.net/networking-ovn
* Mailing list:
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss

+ 3
- 3
devstack/README.rst View File

@@ -4,15 +4,15 @@

1. Download devstack and networking-ovn::

git clone https://git.openstack.org/openstack-dev/devstack.git
git clone https://git.openstack.org/openstack/networking-ovn.git
git clone https://opendev.org/openstack/devstack.git
git clone https://opendev.org/openstack/networking-ovn.git

2. Add networking-ovn to devstack. The minimal set of critical local.conf
additions are the following::

cd devstack
cat << EOF >> local.conf
> enable_plugin networking-ovn https://git.openstack.org/openstack/networking-ovn
> enable_plugin networking-ovn https://opendev.org/openstack/networking-ovn
> enable_service ovn-northd
> enable_service ovn-controller
> enable_service networking-ovn-metadata-agent

+ 1
- 1
devstack/computenode-local.conf.sample View File

@@ -23,7 +23,7 @@ ADMIN_PASSWORD=password
#OVN_REPO=https://github.com/blp/ovs-reviews.git
#OVN_BRANCH=ovn

enable_plugin networking-ovn https://git.openstack.org/openstack/networking-ovn
enable_plugin networking-ovn https://opendev.org/openstack/networking-ovn

disable_all_services
enable_service n-cpu

+ 1
- 1
devstack/db-local.conf.sample View File

@@ -22,7 +22,7 @@ ADMIN_PASSWORD=password
#OVN_REPO=https://github.com/blp/ovs-reviews.git
#OVN_BRANCH=ovn

enable_plugin networking-ovn https://git.openstack.org/openstack/networking-ovn
enable_plugin networking-ovn https://opendev.org/openstack/networking-ovn

disable_all_services
enable_service ovn-northd

+ 4
- 4
devstack/local.conf.sample View File

@@ -22,7 +22,7 @@ ADMIN_PASSWORD=password
#OVN_REPO=https://github.com/blp/ovs-reviews.git
#OVN_BRANCH=ovn

enable_plugin networking-ovn https://git.openstack.org/openstack/networking-ovn
enable_plugin networking-ovn https://opendev.org/openstack/networking-ovn
enable_service ovn-northd
enable_service ovn-controller
enable_service networking-ovn-metadata-agent
@@ -38,12 +38,12 @@ disable_service q-dhcp
disable_service q-meta

# Enable services, these services depend on neutron plugin.
enable_plugin neutron https://git.openstack.org/openstack/neutron
enable_plugin neutron https://opendev.org/openstack/neutron
enable_service q-trunk
#enable_service q-qos

# Enable neutron tempest plugin tests
enable_plugin neutron-tempest-plugin https://git.openstack.org/openstack/neutron-tempest-plugin
enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin

# Horizon (the web UI) is enabled by default. You may want to disable
# it here to speed up DevStack a bit.
@@ -89,7 +89,7 @@ disable_service cinder c-sch c-api c-vol
# load balancer and it only supports L4 TCP load balancer and doesn't support
# health check monitor and other advanced features supported by Octavia
# amphore driver. If you want to enable Octavia amphore driver, please see
# http://git.openstack.org/cgit/openstack/networking-ovn/tree/devstack/ovn-octavia-provider.conf.sample
# http://opendev.org/openstack/networking-ovn/tree/devstack/ovn-octavia-provider.conf.sample

# If you want to enable a provider network instead of the default private
# network after your DevStack environment installation, you *must* set

+ 2
- 2
devstack/ovn-octavia-provider.conf.sample View File

@@ -11,7 +11,7 @@ RABBIT_PASSWORD=password
SERVICE_PASSWORD=password
SERVICE_TOKEN=password
ADMIN_PASSWORD=password
enable_plugin networking-ovn https://git.openstack.org/openstack/networking-ovn
enable_plugin networking-ovn https://opendev.org/openstack/networking-ovn
enable_service ovn-northd
enable_service ovn-controller
enable_service networking-ovn-metadata-agent
@@ -25,7 +25,7 @@ disable_service q-meta

OCTAVIA_NODE="api"
DISABLE_AMP_IMAGE_BUILD=True
enable_plugin octavia https://git.openstack.org/openstack/octavia
enable_plugin octavia https://opendev.org/openstack/octavia
enable_service octavia
enable_service o-api
enable_service o-hk

+ 2
- 2
devstack/upgrade/settings View File

@@ -5,10 +5,10 @@ register_project_for_upgrade networking-ovn
# bug/1648176
UPGRADE_PROJECTS="networking-ovn ${UPGRADE_PROJECTS/ networking-ovn/}"

devstack_localrc base enable_plugin networking-ovn http://git.openstack.org/openstack/networking-ovn $BASE_DEVSTACK_BRANCH
devstack_localrc base enable_plugin networking-ovn http://opendev.org/openstack/networking-ovn $BASE_DEVSTACK_BRANCH
devstack_localrc base OVN_BRANCH="branch-2.11"

devstack_localrc target enable_plugin networking-ovn http://git.openstack.org/openstack/networking-ovn
devstack_localrc target enable_plugin networking-ovn http://opendev.org/openstack/networking-ovn
devstack_localrc target OVN_BRANCH="master"

# Common options for both base and target DevStack

+ 1
- 1
devstack/vtep-local.conf.sample View File

@@ -22,7 +22,7 @@ ADMIN_PASSWORD=password
#OVN_REPO=https://github.com/blp/ovs-reviews.git
#OVN_BRANCH=ovn

enable_plugin networking-ovn https://git.openstack.org/openstack/networking-ovn
enable_plugin networking-ovn https://opendev.org/openstack/networking-ovn

disable_all_services
enable_service ovn-controller-vtep

+ 9
- 9
doc/source/contributor/testing.rst View File

@@ -16,7 +16,7 @@ to use either CentOS 7 or the latest Ubuntu LTS (16.04, Xenial).

::

$ git clone https://git.openstack.org/openstack-dev/devstack.git
$ git clone https://opendev.org/openstack/devstack.git
$ sudo ./devstack/tools/create-stack-user.sh

3. Switch to the ``stack`` user and clone DevStack and networking-ovn.
@@ -24,8 +24,8 @@ to use either CentOS 7 or the latest Ubuntu LTS (16.04, Xenial).
::

$ sudo su - stack
$ git clone https://git.openstack.org/openstack-dev/devstack.git
$ git clone https://git.openstack.org/openstack/networking-ovn.git
$ git clone https://opendev.org/openstack/devstack.git
$ git clone https://opendev.org/openstack/networking-ovn.git

4. Configure DevStack to use networking-ovn.

@@ -385,14 +385,14 @@ different host name. Having same host name for both VMs will confuse Nova and
will not produce two hypervisors when you query nova hypervisor list later.
Once the VM is setup, create the ``stack`` user::

$ git clone https://git.openstack.org/openstack-dev/devstack.git
$ git clone https://opendev.org/openstack/devstack.git
$ sudo ./devstack/tools/create-stack-user.sh

Switch to the ``stack`` user and clone DevStack and networking-ovn::

$ sudo su - stack
$ git clone https://git.openstack.org/openstack-dev/devstack.git
$ git clone https://git.openstack.org/openstack/networking-ovn.git
$ git clone https://opendev.org/openstack/devstack.git
$ git clone https://opendev.org/openstack/networking-ovn.git

networking-ovn comes with another sample configuration file that can be used
for this::
@@ -595,9 +595,9 @@ Next, get networking_ovn, neutron and devstack.

::

$ git clone https://git.openstack.org/openstack/networking-ovn.git
$ git clone https://git.openstack.org/openstack/neutron.git
$ git clone https://git.openstack.org/openstack-dev/devstack.git
$ git clone https://opendev.org/openstack/networking-ovn.git
$ git clone https://opendev.org/openstack/neutron.git
$ git clone https://opendev.org/openstack/devstack.git

Then execute the script to prepare the environment.


+ 1
- 1
doc/source/contributor/vagrant/sparse-architecture.rst View File

@@ -49,7 +49,7 @@ Deployment
#. Clone the ``networking-ovn`` repository locally and change to the
``vagrant/sparse`` directory::

$ git clone https://git.openstack.org/openstack/networking-ovn.git
$ git clone https://opendev.org/openstack/networking-ovn.git
$ cd networking-ovn/vagrant/sparse

#. If necessary, adjust any configuration in the ``instances.yml`` file.

+ 1
- 1
doc/source/index.rst View File

@@ -28,7 +28,7 @@ Contents
Links
-----
* Free software: Apache license
* Source: https://git.openstack.org/cgit/openstack/networking-ovn
* Source: https://opendev.org/openstack/networking-ovn
* Design documents: https://docs.openstack.org/networking-ovn/latest/contributor/design/index.html
* Bugs: https://bugs.launchpad.net/networking-ovn
* Mailing list:

+ 2
- 2
doc/source/install/tripleo.rst View File

@@ -43,8 +43,8 @@ Deployment steps

.. code-block:: console

$ git clone https://git.openstack.org/openstack/tripleo-quickstart
$ git clone https://git.openstack.org/openstack/networking-ovn
$ git clone https://opendev.org/openstack/tripleo-quickstart
$ git clone https://opendev.org/openstack/networking-ovn

#. Once you're done, run quickstart as follows (3 controller HA + 1 compute):


+ 1
- 1
tox.ini View File

@@ -9,7 +9,7 @@ install_command = pip install {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning,ignore::DeprecationWarning:distutils,ignore::DeprecationWarning:site
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals = bash

Loading…
Cancel
Save