Browse code

Merge "update faq entry about running other branches"

Jenkins authored on 2015/10/07 05:42:55
Showing 1 changed files
... ...
@@ -124,24 +124,30 @@ Of course!
124 124
 
125 125
         enable_service q-svc
126 126
 
127
-How do I run a specific OpenStack milestone?
127
+How do I run a specific OpenStack release?
128 128
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
129 129
 
130
-OpenStack milestones have tags set in the git repo. Set the
131
-appropriate tag in the ``*_BRANCH`` variables in ``local.conf``.
132
-Swift is on its own release schedule so pick a tag in the Swift repo
133
-that is just before the milestone release. For example:
130
+DevStack master tracks the upstream master of all the projects. If you
131
+would like to run a stable branch of OpenStack, you should use the
132
+corresponding stable branch of DevStack as well. For instance the
133
+``stable/kilo`` version of DevStack will already default to all the
134
+projects running at ``stable/kilo`` levels.
134 135
 
135
-    ::
136
+Note: it's also possible to manually adjust the ``*_BRANCH`` variables
137
+further if you would like to test specific milestones, or even custom
138
+out of tree branches. This is done with entries like the following in
139
+your ``local.conf``
140
+
141
+::
136 142
 
137 143
         [[local|localrc]]
138
-        GLANCE_BRANCH=stable/kilo
139
-        HORIZON_BRANCH=stable/kilo
140
-        KEYSTONE_BRANCH=stable/kilo
141
-        NOVA_BRANCH=stable/kilo
142
-        GLANCE_BRANCH=stable/kilo
143
-        NEUTRON_BRANCH=stable/kilo
144
-        SWIFT_BRANCH=2.3.0
144
+        GLANCE_BRANCH=11.0.0.0rc1
145
+        NOVA_BRANCH=12.0.0.0.rc1
146
+
147
+
148
+Upstream DevStack is only tested with master and stable
149
+branches. Setting custom BRANCH definitions is not guarunteed to
150
+produce working results.
145 151
 
146 152
 What can I do about RabbitMQ not wanting to start on my fresh new VM?
147 153
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~