From 334f8acbd26cb95a50a92fe433aa9c591debcc87 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 9 Mar 2019 13:32:04 +0000 Subject: [PATCH] Remove outdated devstack section from docs This is linking to a very wrong local.conf. The real state of the world is vastly different and more complicated. Change-Id: I2a269a6e0dce4e637408cefd0d7e7fa12eabb3bb --- doc/source/contributor/local.conf | 60 ------------------------------ doc/source/contributor/testing.rst | 18 --------- 2 files changed, 78 deletions(-) delete mode 100644 doc/source/contributor/local.conf diff --git a/doc/source/contributor/local.conf b/doc/source/contributor/local.conf deleted file mode 100644 index 3b66d569f..000000000 --- a/doc/source/contributor/local.conf +++ /dev/null @@ -1,60 +0,0 @@ -[[local|localrc]] -# Configure passwords and the Swift Hash -MYSQL_PASSWORD=DEVSTACK_PASSWORD -RABBIT_PASSWORD=DEVSTACK_PASSWORD -SERVICE_TOKEN=DEVSTACK_PASSWORD -ADMIN_PASSWORD=DEVSTACK_PASSWORD -SERVICE_PASSWORD=DEVSTACK_PASSWORD -SWIFT_HASH=DEVSTACK_PASSWORD - -# Configure the stable OpenStack branches used by DevStack -# For stable branches see -# http://opendev.org/openstack-dev/devstack -CINDER_BRANCH=stable/OPENSTACK_VERSION -CEILOMETER_BRANCH=stable/OPENSTACK_VERSION -GLANCE_BRANCH=stable/OPENSTACK_VERSION -HEAT_BRANCH=stable/OPENSTACK_VERSION -HORIZON_BRANCH=stable/OPENSTACK_VERSION -KEYSTONE_BRANCH=stable/OPENSTACK_VERSION -NEUTRON_BRANCH=stable/OPENSTACK_VERSION -NOVA_BRANCH=stable/OPENSTACK_VERSION -SWIFT_BRANCH=stable/OPENSTACK_VERSION -ZAQAR_BRANCH=stable/OPENSTACK_VERSION - -# Enable Swift -enable_service s-proxy -enable_service s-object -enable_service s-container -enable_service s-account - -# Disable Nova Network and enable Neutron -disable_service n-net -enable_service q-svc -enable_service q-agt -enable_service q-dhcp -enable_service q-l3 -enable_service q-meta -enable_service q-metering - -# Enable Zaqar -enable_plugin zaqar https://github.com/openstack/zaqar -enable_service zaqar-server - -# Enable Heat -enable_service h-eng -enable_service h-api -enable_service h-api-cfn -enable_service h-api-cw - -# Automatically download and register a VM image that Heat can launch -# For more information on Heat and DevStack see -# https://docs.openstack.org/heat/latest/getting_started/on_devstack.html -IMAGE_URL_SITE="http://download.fedoraproject.org" -IMAGE_URL_PATH="/pub/fedora/linux/releases/25/CloudImages/x86_64/images/" -IMAGE_URL_FILE="Fedora-Cloud-Base-25-1.3.x86_64.qcow2" -IMAGE_URLS+=","$IMAGE_URL_SITE$IMAGE_URL_PATH$IMAGE_URL_FILE - -# Logging -LOGDAYS=1 -LOGFILE=/opt/stack/logs/stack.sh.log -LOGDIR=/opt/stack/logs diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst index c72946c9b..c45b88049 100644 --- a/doc/source/contributor/testing.rst +++ b/doc/source/contributor/testing.rst @@ -42,24 +42,6 @@ public clouds but first and foremost they must be run against OpenStack. In practice, this means that the tests should initially be run against a stable branch of `DevStack `_. -DevStack -******** - -There are many ways to run and configure DevStack. The link above will show -you how to run DevStack a number of ways. You'll need to choose a method -you're familiar with and can run in your environment. Wherever DevStack is -running, we need to make sure that openstacksdk contributors are -using the same configuration. - -This is the ``local.conf`` file we use to configure DevStack. - -.. literalinclude:: local.conf - -Replace ``DEVSTACK_PASSWORD`` with a password of your choice. - -Replace ``OPENSTACK_VERSION`` with a `stable branch `_ -of OpenStack (without the ``stable/`` prefix on the branch name). - os-client-config ****************