diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-26 03:04:32 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-05 01:12:06 +0100 |
| commit | 6a4b936669282c88b9842d78b9add1e64864aec6 (patch) | |
| tree | 34b8e64773089f52f5ac8ea3980972ccc38ad2ac | |
| parent | 165772e48a69ebc2a69c0ed94828d2f91110af81 (diff) | |
[vPDF] Use local-virtual1, unify pkg requirements
Until PDF/IDF land in Pharos for all our virtual PODs, use a common
vPDF we already provide as an example to mimic the old hardcoded
behavior while leveraging PDF/IDF parameterization.
As a consequence, python requirements previously only needed for
baremetal should now also be installed for virtual deploys too.
JIRA: FUEL-322
Change-Id: Ied1c907275285a9086450a15491ae516a0db1be2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rwxr-xr-x | ci/deploy.sh | 5 | ||||
| -rw-r--r-- | mcp/scripts/requirements_deb.yaml | 16 | ||||
| -rw-r--r-- | mcp/scripts/requirements_rpm.yaml | 16 |
3 files changed, 20 insertions, 17 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 5026d2d84..9d82b73c5 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -195,8 +195,11 @@ do ;; p) TARGET_POD=${OPTARG} - if [[ "${TARGET_POD}" =~ "virtual" ]]; then + if [[ "${TARGET_POD}" =~ virtual ]]; then DEPLOY_TYPE='virtual' + # All vPODs will use 'local-virtual1' PDF/IDF for now + TARGET_LAB='local' + TARGET_POD='virtual1' fi ;; P) diff --git a/mcp/scripts/requirements_deb.yaml b/mcp/scripts/requirements_deb.yaml index 9a6ec8273..bb0d586da 100644 --- a/mcp/scripts/requirements_deb.yaml +++ b/mcp/scripts/requirements_deb.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 Mirantis Inc., Enea AB and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -23,15 +23,15 @@ requirements_pkg: - rsync - uuid-runtime - virtinst + # python is indirectly required for PDF parsing + - python + - python-ipaddress + - python-jinja2 + - python-yaml + # Optional, deploy-type-specific requirements + # baremetal: # Optional, arch-specific requirements, matched by key name = $(uname -m) aarch64: # AArch64 VMs use AAVMF (guest UEFI) - ipxe-qemu - qemu-efi - # Optional, deploy-type-specific requirements - baremetal: - # For baremetal, python is indirectly required for PDF parsing - - python - - python-ipaddress - - python-jinja2 - - python-yaml diff --git a/mcp/scripts/requirements_rpm.yaml b/mcp/scripts/requirements_rpm.yaml index ebd7e85dc..d510ba87d 100644 --- a/mcp/scripts/requirements_rpm.yaml +++ b/mcp/scripts/requirements_rpm.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 Mirantis Inc., Enea AB and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -27,14 +27,14 @@ requirements_pkg: - util-linux - virt-install - wget - # Optional, arch-specific requirements, matched by key name = $(uname -m) - aarch64: - # AArch64 VMs use AAVMF (guest UEFI) - - AAVMF - # Optional, deploy-type-specific requirements - baremetal: - # For baremetal, python is indirectly required for PDF parsing + # For python is indirectly required for PDF parsing - python - python-ipaddress - python-jinja2 - python-yaml + # Optional, deploy-type-specific requirements + # baremetal: + # Optional, arch-specific requirements, matched by key name = $(uname -m) + aarch64: + # AArch64 VMs use AAVMF (guest UEFI) + - AAVMF |