summaryrefslogtreecommitdiffstats
path: root/xci
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-06-25 11:21:30 +0100
committerMarkos Chandras <mchandras@suse.de>2018-06-26 16:29:05 +0100
commit296da182f30cd4c6943cdc8943028fb58318fc27 (patch)
treee872dd854489ec535931d02d384e2ceb9951d860 /xci
parent92fc2a3c43305532b885ef70201f363204b69a3b (diff)
xci: xci-lib.sh: Install shade and python-pyyaml on the deployment node
In preparation for using PDF/IDF to deploy nodes in XCI, we need to have shade and python-pyyaml on the host since these are requirements for the OpenStack Ansible modules (eg os_ironic) and the dynamic inventories. Change-Id: Ie26af0dc58599af6e29a47d91707976dcf16ac6d Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci')
-rw-r--r--xci/files/xci-lib.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/xci/files/xci-lib.sh b/xci/files/xci-lib.sh
index f55701a2..060dc267 100644
--- a/xci/files/xci-lib.sh
+++ b/xci/files/xci-lib.sh
@@ -13,7 +13,6 @@
function bootstrap_xci_env() {
# Declare our virtualenv
export XCI_VENV=${XCI_PATH}/venv/
-
# source user vars
source $XCI_PATH/xci/config/user-vars
# source pinned versions
@@ -48,6 +47,7 @@ function install_ansible() {
net-tools
python-devel
python
+ python-pyyaml
venv
wget
curl
@@ -69,6 +69,7 @@ function install_ansible() {
[pip]=python-pip
[python]=python
[python-devel]=python-devel
+ [python-pyyaml]=python-PyYAML
[venv]=python-virtualenv
[wget]=wget
[curl]=curl
@@ -97,6 +98,7 @@ function install_ansible() {
[pip]=python-pip
[python]=python-minimal
[python-devel]=libpython-dev
+ [python-pyyaml]=python-yaml
[venv]=python-virtualenv
[wget]=wget
[curl]=curl
@@ -120,6 +122,7 @@ function install_ansible() {
[pip]=python2-pip
[python]=python
[python-devel]=python-devel
+ [python-pyyaml]=PyYAML
[venv]=python-virtualenv
[wget]=wget
[curl]=curl
@@ -155,7 +158,7 @@ function install_ansible() {
# We are inside the virtualenv now so we should be good to use pip and python from it.
pip -q install --upgrade pip==9.0.3 # We need a version which supports the '-c' parameter
- pip -q install --upgrade -c $uc -c $osa_uc ara virtualenv pip setuptools ansible==$XCI_ANSIBLE_PIP_VERSION ansible-lint==3.4.21
+ pip -q install --upgrade -c $uc -c $osa_uc ara virtualenv pip setuptools shade ansible==$XCI_ANSIBLE_PIP_VERSION ansible-lint==3.4.21
ara_location=$(python -c "import os,ara; print(os.path.dirname(ara.__file__))")
export ANSIBLE_CALLBACK_PLUGINS="/etc/ansible/roles/plugins/callback:${ara_location}/plugins/callbacks"