Permalink
Browse files

Merge "Run extras playbook by default"

  • Loading branch information...
2 parents b6dbf6a + 6a05cf5 commit e2e73b94bd88a3f9cc19925a59cbd12ff6172060 Jenkins committed with openstack-gerrit Jan 4, 2017
Showing with 8 additions and 9 deletions.
  1. +1 −1 README.rst
  2. +0 −1 ci-scripts/devmode_tempest.sh
  3. +0 −2 ci-scripts/full-deploy.sh
  4. +6 −4 doc/source/working-with-extras.rst
  5. +1 −1 quickstart.sh
View
@@ -66,7 +66,7 @@ Deploying without instructions
------------------------------
::
- bash quickstart.sh -p quickstart-extras.yml -r quickstart-extras-requirements.txt --tags all $VIRTHOST
+ bash quickstart.sh --tags all $VIRTHOST
You may choose to execute an end to end deployment without displaying the
instructions and scripts provided by default. Using the ``--tags all`` flag
@@ -23,7 +23,6 @@ bash quickstart.sh \
--working-dir $WORKSPACE/ \
--no-clone \
--release master-tripleo-ci \
- --playbook quickstart-extras.yml \
--extra-vars test_ping=False \
--extra-vars run_tempest=True \
$VIRTHOST
@@ -71,7 +71,6 @@ if [ "$JOB_TYPE" = "dlrn-gate" ]; then
--retain-inventory \
--extra-vars compressed_gating_repo="/home/stack/gating_repo.tar.gz" \
--config $WORKSPACE/config/general_config/$CONFIG.yml \
- --playbook quickstart-extras.yml \
--skip-tags provision \
--tags all \
--teardown none \
@@ -86,7 +85,6 @@ else
--no-clone \
--release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
--bootstrap \
- --playbook quickstart-extras.yml \
$OPT_ADDITIONAL_PARAMETERS \
$VIRTHOST
fi
@@ -21,15 +21,17 @@ pulling in additional dependencies using ``pip install`` and the
To run a full end-to-end deployment including verification, add these command
line options when running ``quickstart.sh``::
- --playbook quickstart-extras.yml
+ --tags all
See ``quickstart.sh --help`` for a full list of options, but here is a full
example using some common developer settings::
./quickstart.sh --requirements quickstart-extras-requirements.txt \
- --playbook quickstart-extras.yml \
- --tags all --teardown all \
- --release master --no-clone --clean \
+ --tags all \
+ --teardown all \
+ --release master \
+ --no-clone \
+ --clean \
--config config/general_config/minimal_pacemaker.yml \
virthost.example.com
View
@@ -9,7 +9,7 @@ DEFAULT_OPT_TAGS="untagged,provision,environment,undercloud-scripts,overcloud-sc
: ${OPT_BOOTSTRAP:=0}
: ${OPT_CLEAN:=0}
-: ${OPT_PLAYBOOK:=quickstart.yml}
+: ${OPT_PLAYBOOK:=quickstart-extras.yml}
: ${OPT_RELEASE:=mitaka}
: ${OPT_RETAIN_INVENTORY_FILE:=0}
: ${OPT_SYSTEM_PACKAGES:=0}

0 comments on commit e2e73b9

Please sign in to comment.