Permalink
Browse files

Merge "Add new stack phase: post-extra"

  • Loading branch information...
Jenkins authored and openstack-gerrit committed Dec 5, 2013
2 parents e9ca36b + feb2883 commit 72acdd93ef11f26d4bd474caa64ec1985843807f
Showing with 13 additions and 2 deletions.
  1. +1 −0 README.md
  2. +3 −0 extras.d/80-tempest.sh
  3. +2 −2 extras.d/README.md
  4. +7 −0 stack.sh
View
@@ -327,6 +327,7 @@ The defined phases are:
* **local** - extracts ``localrc`` from ``local.conf`` before ``stackrc`` is sourced
* **post-config** - runs after the layer 2 services are configured and before they are started
* **extra** - runs after services are started and before any files in ``extra.d`` are executed
+* **post-extra** - runs after files in ``extra.d`` are executed
The file is processed strictly in sequence; meta-sections may be specified more than once but if any settings are duplicated the last to appear in the file will be used.
View
@@ -14,6 +14,9 @@ if is_service_enabled tempest; then
echo_summary "Initializing Tempest"
configure_tempest
init_tempest
+ elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then
+ # local.conf Tempest option overrides
+ :
fi
if [[ "$1" == "unstack" ]]; then
View
@@ -19,10 +19,10 @@ sourced with one or more arguments, the first of which defines the hook phase:
source: always called first in any of the scripts, used to set the
initial defaults in a lib/* script or similar
- stack: called by stack.sh. There are three possible values for
+ stack: called by stack.sh. There are four possible values for
the second arg to distinguish the phase stack.sh is in:
- arg 2: install | post-config | extra
+ arg 2: install | post-config | extra | post-extra
unstack: called by unstack.sh
View
@@ -1277,6 +1277,13 @@ if [[ -d $TOP_DIR/extras.d ]]; then
done
fi
+# Local Configuration
+# ===================
+
+# Apply configuration from local.conf if it exists for layer 2 services
+# Phase: post-extra
+merge_config_group $TOP_DIR/local.conf post-extra
+
# Run local script
# ================

0 comments on commit 72acdd9

Please sign in to comment.