diff --git a/devstack/README.rst b/devstack/README.rst index 8f5c17497..9ea1b617e 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -5,7 +5,7 @@ DevStack Integration This directory contains the files necessary to integrate zun with devstack. Refer the quickstart guide at -https://docs.openstack.org/zun/latest/contributor/manual-devstack.html +https://docs.openstack.org/zun/latest/contributor/quickstart.html for more information on using devstack and zun. To install zun into devstack, add the following settings to enable the diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst index 38e363d2b..edfba3dfa 100644 --- a/doc/source/contributor/index.rst +++ b/doc/source/contributor/index.rst @@ -25,7 +25,6 @@ project. :maxdepth: 1 Developer Contribution Guide - Configure Zun with DevStack Manually Setting Up Your Development Environment Under Mod WSGI Running Tempest Tests Running Unit Tests diff --git a/doc/source/contributor/manual-devstack.rst b/doc/source/contributor/manual-devstack.rst deleted file mode 100644 index f80ad975b..000000000 --- a/doc/source/contributor/manual-devstack.rst +++ /dev/null @@ -1,166 +0,0 @@ -.. _manual-install: - -=============================== -Manually Adding Zun to DevStack -=============================== -If you are getting started with zun it is recommended you follow the -:ref:`quickstart` to get up and running with zun. This guide covers -a more in-depth process to setup zun with devstack. - -This session has been tested on Ubuntu only. - -Clone devstack:: - - # Create a root directory for devstack if needed - sudo mkdir -p /opt/stack - sudo chown $USER /opt/stack - - git clone https://git.openstack.org/openstack-dev/devstack /opt/stack/devstack - -We will run devstack with minimal local.conf settings required to enable -required OpenStack services:: - - cat > /opt/stack/devstack/local.conf << END - [[local|localrc]] - HOST_IP=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/') - DATABASE_PASSWORD=password - RABBIT_PASSWORD=password - SERVICE_TOKEN=password - SERVICE_PASSWORD=password - ADMIN_PASSWORD=password - enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container - enable_plugin zun https://git.openstack.org/openstack/zun - enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork - END - -More devstack configuration information can be found at -https://docs.openstack.org/devstack/latest/configuration.html - -More neutron configuration information can be found at -https://docs.openstack.org/devstack/latest/guides/neutron.html - -Run devstack:: - - cd /opt/stack/devstack - ./stack.sh - -Prepare your session to be able to use the various openstack clients including -nova, neutron, and glance. Create a new shell, and source the devstack openrc -script:: - - source /opt/stack/devstack/openrc admin admin - -Create a database in MySQL for zun:: - - mysql -h 127.0.0.1 -u root -ppassword mysql <