diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-11-21 09:35:49 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-11-21 18:37:46 +0000 |
| commit | 4689cace9d3aa67d24d740201f1cb4ab29d930d8 (patch) | |
| tree | ea4aec056899e5d753802ab0a6430983f234c995 | |
| parent | b8791a548b1845691068830679b5fa8855def6e5 (diff) | |
xci: Use the dib pip-and-virtualenv element
The element will ensure that we have a reasonable set of pip
and virtualenv packages in place as well as pick the right
python version for the distribution. We also make sure that
we use python2 everywhere.
Change-Id: I8a83af9acffbd8d6d583832956e1685100ec508a
Signed-off-by: Markos Chandras <mchandras@suse.de>
| -rw-r--r-- | bifrost/playbooks/opnfv-virtual.yaml | 4 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/bifrost/playbooks/opnfv-virtual.yaml b/bifrost/playbooks/opnfv-virtual.yaml index 3cba98b6..4e985db8 100644 --- a/bifrost/playbooks/opnfv-virtual.yaml +++ b/bifrost/playbooks/opnfv-virtual.yaml @@ -53,10 +53,12 @@ - role: bifrost-create-dib-image dib_imagetype: "qcow2" dib_imagename: "{{deploy_image}}" + dib_env_vars: + DIB_PYTHON_VERSION: 2 dib_os_element: "{{ lookup('env','DIB_OS_ELEMENT') }}" dib_os_release: "{{ lookup('env', 'DIB_OS_RELEASE') }}" extra_dib_elements: "{{ lookup('env', 'EXTRA_DIB_ELEMENTS') | default('') }}" - dib_elements: "vm enable-serial-console simple-init devuser growroot {{ extra_dib_elements }}" + dib_elements: "vm enable-serial-console simple-init devuser openssh-server growroot pip-and-virtualenv {{ extra_dib_elements }}" dib_packages: "{{ lookup('env', 'DIB_OS_PACKAGES') }}" dib_notmpfs: true when: create_image_via_dib | bool == true and transform_boot_image | bool == false diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 92649857..20f3d95a 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -104,19 +104,16 @@ case ${OS_FAMILY,,} in export DIB_OS_RELEASE="${DIB_OS_RELEASE:-xenial}" export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-ubuntu-minimal}" export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl,iptables}" - export EXTRA_DIB_ELEMENTS="${EXTRA_DIB_ELEMENTS:-openssh-server}" ;; redhat) export DIB_OS_RELEASE="${DIB_OS_RELEASE:-7}" export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-centos-minimal}" export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vim,less,bridge-utils,iputils,rsyslog,curl,iptables}" - export EXTRA_DIB_ELEMENTS="${EXTRA_DIB_ELEMENTS:-openssh-server}" ;; suse) export DIB_OS_RELEASE="${DIB_OS_RELEASE:-42.3}" export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-opensuse-minimal}" export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vim,less,bridge-utils,iputils,rsyslog,curl,iptables}" - export EXTRA_DIB_ELEMENTS="${EXTRA_DIB_ELEMETS:-openssh-server}" ;; esac |