diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-03 18:12:54 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-05 01:12:03 +0100 |
| commit | 846fa16a35f9616a34a3033bd20eb7ad767ef3e7 (patch) | |
| tree | 2bbef8aa73213e3777add19f4df5bff4c62259cc /ci/deploy.sh | |
| parent | fc1425fb6ef4c6004371a8b54ee05870d446659e (diff) | |
[baremetal] Retire example pod_config.yaml
It is easier to just generate the `pod_config.yaml` file than to
maintain it, so let's remove it.
While at it, link sample PDF/IDF inside pharos git submodule, so we
don't have to pass a different lab-config URI to use the sample.
To generate pod_config.yml for the sample PDF/IDF:
$ ./ci/deploy.sh -l local -p pod1 -s os-odl-nofeature-ha -d
$ cat mcp/deploy/images/pod_config.yml
JIRA: FUEL-322
Change-Id: If5898f92ef54bebc31d57f9632959e9093a89250
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'ci/deploy.sh')
| -rwxr-xr-x | ci/deploy.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index cf166bae9..5026d2d84 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -70,10 +70,10 @@ $(notify "Input parameters to the build script are:" 2) companion should be available at: <base-uri>/labs/<lab-name>/<pod-name>.yaml <base-uri>/labs/<lab-name>/idf-<pod-name>.yaml - An example config is provided inside current repo in - <./mcp/config>. The default is using the git submodule tracking 'OPNFV Pharos' in <./mcp/scripts/pharos>. + An example config is provided inside current repo in + <./mcp/config>, automatically linked as <./mcp/scripts/pharos/labs/local>. -d Dry-run - Produce deploy config files, but do not execute deploy -D Debug logging - Enable extra logging in sh deploy scripts (set -x) -e Do not launch environment deployment @@ -285,6 +285,7 @@ LOCAL_PDF="${STORAGE_DIR}/$(basename "${BASE_CONFIG_PDF}")" LOCAL_IDF="${STORAGE_DIR}/$(basename "${BASE_CONFIG_IDF}")" LOCAL_PDF_RECLASS="${STORAGE_DIR}/pod_config.yml" rm -f "${LOCAL_PDF_RECLASS}" +ln -sf "$(readlink -f "../config/labs/local")" "./pharos/labs/" if ! curl --create-dirs -o "${LOCAL_PDF}" "${BASE_CONFIG_PDF}"; then if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then notify "[ERROR] Could not retrieve PDF (Pod Descriptor File)!\n" 1>&2 |