From b55e8ef23f29b2505887a01d146c452f37613409 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 6 Jul 2015 16:51:37 -0700 Subject: [PATCH] Install zuul-env venv with puppet We need the zuul-env venv to be on all slaves not just dib/nodepool built slaves. Do this by puppeting the virtualenv setup and pip install of zuul in slave_common.pp. Change-Id: I290a695c697fb456bee6f8212ba50b6c1b4533fc --- .../openstack_project/files/zuul-env-reqs.txt | 1 + .../openstack_project/manifests/slave_common.pp | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 modules/openstack_project/files/zuul-env-reqs.txt diff --git a/modules/openstack_project/files/zuul-env-reqs.txt b/modules/openstack_project/files/zuul-env-reqs.txt new file mode 100644 index 0000000000..3faadb4e6e --- /dev/null +++ b/modules/openstack_project/files/zuul-env-reqs.txt @@ -0,0 +1 @@ +-e git+https://git.openstack.org/openstack-infra/zuul#egg=zuul diff --git a/modules/openstack_project/manifests/slave_common.pp b/modules/openstack_project/manifests/slave_common.pp index 4474055b34..704109c221 100644 --- a/modules/openstack_project/manifests/slave_common.pp +++ b/modules/openstack_project/manifests/slave_common.pp @@ -108,4 +108,21 @@ class openstack_project::slave_common( package { $header_packages: ensure => present } + + file { '/etc/zuul-env-reqs.txt': + ensure => present, + owner => 'root', + group => 'root', + mode => '0444', + source => 'puppet:///modules/openstack_project/zuul-env-reqs.txt', + } + + python::virtualenv { '/usr/zuul-env': + ensure => present, + requirements => '/etc/zuul-env-reqs.txt', + owner => 'root', + group => 'root', + timeout => 0, + require => File['/etc/zuul-env-reqs.txt'], + } }