From 5bea3e11fb128bca13bcf2907dfd19a7e699146f Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 17 Dec 2015 03:30:41 +0000 Subject: [PATCH] Revert "Install etcd on nodes for tooz unit tests" This package doesn't exist on, at least, Ubuntu 12.04 LTS. Please check that the package names are relevant to the platforms targeted before resubmitting/approving. This reverts commit 39839a04ddf3c12ad61e4ac153b826f2172afe35. Change-Id: I2dc258d800bea63b721e0ae9f5a33cd26bb1d728 --- modules/openstack_project/manifests/jenkins_params.pp | 2 -- modules/openstack_project/manifests/thick_slave.pp | 1 - 2 files changed, 3 deletions(-) diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp index 12206a8534..f80025e00e 100644 --- a/modules/openstack_project/manifests/jenkins_params.pp +++ b/modules/openstack_project/manifests/jenkins_params.pp @@ -14,7 +14,6 @@ class openstack_project::jenkins_params { $docbook_xml_package = 'docbook-style-xsl' $docbook5_xml_package = 'docbook5-schemas' $docbook5_xsl_package = 'docbook5-style-xsl' - $etcd_package = 'etcd' $firefox_package = 'firefox' $graphviz_package = 'graphviz' $libcurl_dev_package = 'libcurl-devel' @@ -111,7 +110,6 @@ class openstack_project::jenkins_params { $docbook5_xml_package = 'docbook5-xml' $docbook5_xsl_package = 'docbook-xsl' $dvipng_package = 'dvipng' - $etcd_package = 'etcd' $firefox_package = 'firefox' $graphviz_package = 'graphviz' $libcurl_dev_package = 'libcurl4-gnutls-dev' diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp index 0a195c9eec..7fcc26da34 100644 --- a/modules/openstack_project/manifests/thick_slave.pp +++ b/modules/openstack_project/manifests/thick_slave.pp @@ -19,7 +19,6 @@ class openstack_project::thick_slave( $::openstack_project::jenkins_params::gettext_package, # for msgfmt, used in translating manuals $::openstack_project::jenkins_params::gnome_doc_package, # for generating translation files for docs $::openstack_project::jenkins_params::graphviz_package, # for generating graphs in docs - $::openstack_project::jenkins_params::etcd_package, # for tooz unit tests $::openstack_project::jenkins_params::firefox_package, # for selenium tests $::openstack_project::jenkins_params::language_fonts_packages, $::openstack_project::jenkins_params::libcurl_dev_package,