Skip to content

Commit ed8f82c

Browse files
committed
Convert kolla-ansible install to exec since python::pip didn not seem able to handle it.
1 parent 14c7d41 commit ed8f82c

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

manifests/init.pp

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,21 @@
5454
}
5555

5656
# Need to add configurable version overrides for KA, Ansible and python...
57-
$ansible_version = "5.10.0"
57+
$ansible_version = '5.10.0'
5858
# Install Anisble - Kolla does not do this.
5959
python::pip { 'ansible':
6060
ensure => $ansible_version,
6161
virtualenv => $kolla_venv,
6262
}
6363

6464
#$ka_version = "14.11.0"
65-
$ka_version = "yoga_eol"
66-
# Install Kolla-Ansible
67-
python::pip { 'kolla-ansible':
68-
#ensure => 'present',
69-
#url => 'git+https://opendev.org/openstack/kolla-ansible@unmaintained/yoga',
70-
ensure => $ka_version,
71-
#url => 'git+https://opendev.org/openstack/kolla-ansible@master',
72-
url => 'git+https://opendev.org/openstack/kolla-ansible',
73-
virtualenv => $kolla_venv,
65+
# Install Kolla-Ansible (the pip module doesn't seem able to handle this)
66+
$ka_version = 'yoga-eol' # The pip module does not suppport non-numeric tags.
67+
exec { 'kolla-ansible':
68+
command => "/bin/bash -c \". ${kolla_venv}/bin/activate && pip install git+https://opendev.org/openstack/kolla-ansible@${ka_version}\"",
69+
cwd => $kolla_venv,
70+
require => Exec['has_kolla_venv'],
71+
creates => "${kolla_venv}/bin/kolla-ansible",
7472
}
7573

7674
# Install config files
@@ -100,7 +98,7 @@
10098
owner => 'root',
10199
group => 'root',
102100
}
103-
101+
104102
$kolla_deploy_dirs = dirtree($kolla_deploy)
105103
file { $kolla_deploy_dirs:
106104
ensure => 'directory',

0 commit comments

Comments
 (0)