diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-04-07 11:52:01 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-04-07 14:34:37 -0400 |
| commit | 9bebfc4c3a614ca6f3721fbef4c466e74411323a (patch) | |
| tree | add216ffcf907ea10fc36d4c260ae773066f7115 /ci | |
| parent | 48d62412ec1e2302edae13e3eee15d1f38c2ab7b (diff) | |
Fixes controller Image to be overcloud-full
New param introduced into THT that exposes the image to use for the
Controller. The new var is defaulted to use overcloud-control and is
causing master to fail.
Changes Include:
- Adds opnfv-environment yaml file to use for common parameters
required in all deployments
- Defaults controllerImage to be overcloud-full
Change-Id: I5da8921d9c9efd167748a3d6f42866d18f46d2b7
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 9e317c8a..c14a91e3 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -922,6 +922,8 @@ function undercloud_prep_overcloud_deploy { DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute" fi + DEPLOY_OPTIONS+=" -e opnfv-environment.yaml" + echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}" ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI |