diff --git a/README.rst b/README.rst index cb0ad1904..b42102ad6 100644 --- a/README.rst +++ b/README.rst @@ -103,17 +103,17 @@ To install, make sure you have *git* installed. Then:: $ ./prepare_devstack.sh +Configure ENABLED_SERVICES in the devstack/localrc file :: + + ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-sch,n-cauth,horizon,mysql,rabbit,sysstat,cinder,c-api,c-vol,c-sch,n-cond,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,n-novnc,n-xvnc,q-lbaas + + Run devstack as normal. Note: the default data source configuration assumes the admin password is 'password':: $ ./stack.sh -Note: The miminum devstack services required to run congress:: - - ENABLED_SERVICES=congress,key,mysql - - 4.2 Standalone-install ---------------------- Install the following software, if you haven't already. diff --git a/doc/source/tutorial-tenant-sharing.rst b/doc/source/tutorial-tenant-sharing.rst index 5874cdcf3..4d1e448e1 100644 --- a/doc/source/tutorial-tenant-sharing.rst +++ b/doc/source/tutorial-tenant-sharing.rst @@ -30,17 +30,10 @@ Setting up Devstack The first step is to install and configure Devstack + Congress: 1) Install Devstack and Congress using the directions in the following - README with the specified password and modifications for - ENABLED_SERVICES below + README. When asked for a password, type "password" without the quotes. https://github.com/stackforge/congress/blob/master/contrib/devstack/README.rst - a) When asked for a password, type "password" without the quotes. - - b) Immediately before running stack.sh, add the following line to ~/devstack/localrc:: - - ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-sch,n-cauth,horizon,mysql,rabbit,sysstat,cinder,c-api,c-vol,c-sch,n-cond,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,n-novnc,n-xvnc,q-lbaas - 2) Change OS_USERNAME to "admin" in both nova and neutron:: /etc/congress/datasources.conf