diff --git a/manifests/site.pp b/manifests/site.pp index dda86b25fa..a88e458b4b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -6,12 +6,12 @@ import "doc_server" # TODO: refactor out of module # Abstract classes: # class openstack_base { - include ssh + include ssh package { "ntp": ensure => installed } - + service { 'ntpd': name => 'ntp', ensure => running, @@ -19,7 +19,7 @@ class openstack_base { hasrestart => true, require => Package['ntp'], } - + $packages = ["python-software-properties", "puppet", "bzr", @@ -146,13 +146,24 @@ node /^keystone(-\d+)?\.slave\.openstack\.org$/ { "python-nova", "python-swift"] - package { $slave_packages: + package { $slave_packages: ensure => "latest", require => [Apt::Ppa["ppa:nova-core/trunk"], Apt::Ppa["ppa:swift-core/trunk"]] } } +node /^quantum(-\d+)?\.slave\.openstack\.org$/ { + $slave_packages = ["python-eventlet", + "python-paste", + "python-routes", + "python-sqlalchemy", + "python-webob"] + package { $slave_packages: + ensure => "latest", + } +} + node /^manuals(-\d+)?\.slave\.openstack\.org$/ { include openstack_jenkins_slave