From b2c4d283a442e349395db2f6f36bfeeabb47b640 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 10 Mar 2015 11:22:59 -0400 Subject: [PATCH] Puppetfile: come back again This has no sense anymore to use OPM as an external repo to store the Puppetfile, it used to break the p-o-c CI. Let's bring back again the Puppetfile here. Change-Id: I495456bb0870a81b892e1737cf8f188278bbdbf9 --- Puppetfile | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++ Rakefile | 12 --- 2 files changed, 224 insertions(+), 12 deletions(-) create mode 100644 Puppetfile diff --git a/Puppetfile b/Puppetfile new file mode 100644 index 00000000..9adadf87 --- /dev/null +++ b/Puppetfile @@ -0,0 +1,224 @@ +# +# Copyright 2014 eNovance SAS +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Puppetfile +forge 'http://forge.puppetlabs.com' + +# OpenStack projects +mod 'openstacklib', + :git => 'git://github.com/enovance/puppet-openstacklib.git', + :ref => '999f7849a3e0653f46f7336ee0fa9c2e38630b7b' +mod 'ceilometer', + :git => 'git://github.com/enovance/puppet-ceilometer.git', + :ref => 'c5c7f4a6a7afd4b9c558e17e5a755e836e182dbe' +mod 'cinder', + :git => 'git://github.com/enovance/puppet-cinder.git', + :ref => 'f6af237764cca3319594e731b6b808a7c557cd4c' +mod 'glance', + :git => 'git://github.com/enovance/puppet-glance.git', + :ref => '9fb3db4a693b6839c2caa45df4cd37f9c21451de' +mod 'heat', + :git => 'git://github.com/enovance/puppet-heat.git', + :ref => 'b1e9e9bd48c3da15be69c0797fb05e7ce0f6698f' +mod 'horizon', + :git => 'git://github.com/enovance/puppet-horizon.git', + :ref => '72e83fa859c4224fcf7772654bdc7464a0bbedde' +mod 'keystone', + :git => 'git://github.com/enovance/puppet-keystone.git', + :ref => '05dab114ee62be81da99fe0bc8071c24c2510a31' +mod 'neutron', + :git => 'git://github.com/enovance/puppet-neutron.git', + :ref => '1e5e1b902964013f7c5c2e7107dcd81ed26db1e5' +mod 'nova', + :git => 'git://github.com/enovance/puppet-nova.git', + :ref => '2a5c1eac6b34ea29bbd3e28d7ee56839f10d83d9' +mod 'swift', + :git => 'git://github.com/enovance/puppet-swift.git', + :ref => '499386a89d2b5059445c887ff383655610f3fcb9' +mod 'tempest', + :git => 'git://github.com/enovance/puppet-tempest.git', + :ref => 'f5e87cad5de119bd483006f06efcd22a34d8bdc4' +mod 'trove', + :git => 'git://github.com/enovance/puppet-trove.git', + :ref => '9e5b82fcdacc07b0f1028cb2928292f8d68ae075' + +# Dependency +mod 'apache', + :git => 'git://github.com/enovance/puppetlabs-apache.git', + :ref => '173967ab8dd21a93d6f2b47ff2641d0092f729b1' +mod 'apt', + :git => 'git://github.com/enovance/puppetlabs-apt.git', + :ref => '9b001af8775c7231ea2656b7eb43d6141b536f49' +mod 'boolean', + :git => 'git://github.com/enovance/puppet-boolean.git', + :ref => '157011a4eaa27f1202a9d94335ee4876b26d377e' +mod 'ceph', + :git => 'git://github.com/enovance/puppet-ceph.git', + :ref => '3b58acf9fdf567bf40d17b3c803c940f1ddc70d1' +#FIXME +mod 'cloud', + :git => 'git://github.com/stackforge/puppet-openstack-cloud.git', + :ref => 'master' +mod 'common', + :git => 'git://github.com/enovance/puppet-module-common.git', + :ref => '2d0606fce1078222dd483e731ec32807f5b4ca53' +mod 'concat', + :git => 'git://github.com/enovance/puppet-concat.git', + :ref => 'ab06c2b8c09d9da82b53a62a5389427720519cd5' +mod 'corosync', + :git => 'git://github.com/enovance/puppetlabs-corosync.git', + :ref => '7bbdcd8c57beab6ba24b06ef5aaee2462f8d3d24' +mod 'dnsclient', + :git => 'git://github.com/enovance/puppet-module-dnsclient.git', + :ref => '4158b30f4660623f98dcdbd1ce9b482556180b57' +mod 'datacat', + :git => 'git://github.com/enovance/puppet-datacat.git', + :ref => '6a2017b31a8808de35b89d90b9e2b681ef9a0918' +mod 'elasticsearch', + :git => 'git://github.com/enovance/puppet-elasticsearch.git', + :ref => '6d08442e8382f0f47388d4185122992c2d73cd9b' +mod 'gcc', + :git => 'git://github.com/enovance/puppetlabs-gcc.git', + :ref => '272e6595a2f4824dafa71a2b751960659c05c35d' +mod 'git', + :git => 'git://github.com/enovance/puppetlabs-git.git', + :ref => '0df1f62130a7752c728efb7555f2b07ca178ee5b' +mod 'hiera', + :git => 'git://github.com/enovance/puppet-hiera.git', + :ref => '1d407be61d800034409e4595a6fb73004b10f70f' +mod 'java', + :git => 'git://github.com/enovance/puppetlabs-java.git', + :ref => '5f60d5e2c041848b4c3e71c0aa6ba99b87774d4a' +mod 'firewall', + :git => 'git://github.com/enovance/puppetlabs-firewall.git', + :ref => '4ed1b43e1629c1b6108133b0fc3be603d03ffe6c' +mod 'fluentd', + :git => 'git://github.com/enovance/puppet-fluentd.git', + :ref => 'f77c3f27e0b91a60c1ee413aa0f4f5704c97955a' +mod 'haproxy', + :git => 'git://github.com/enovance/puppetlabs-haproxy.git', + :ref => 'fc1166f28d411dfd4f59d4bfd6936595c014a11b' +mod 'inifile', + :git => 'git://github.com/enovance/puppetlabs-inifile.git', + :ref => 'ae23a4db97d2815ec305d0529912685f07746d3c' +mod 'keepalived', + :git => 'git://github.com/enovance/puppet-module-keepalived.git', + :ref => 'eb345b6d3b25106cbe166028f2b8dd9974a10230' +mod 'kibana3', + :git => 'git://github.com/enovance/kibana3.git', + :ref => '1c448ef538bb08236cad382b2621d6d09bee1f63' +mod 'vcsrepo', + :git => 'git://github.com/enovance/puppetlabs-vcsrepo.git', + :ref => '4592bfd59cd5d4795069798a14b483e16c98c1ff' +mod 'kmod', + :git => 'git://github.com/enovance/puppet-kmod.git', + :ref => 'accc40093e6f8ee9cc472e9eb6ba3bab4bad3a1f' +mod 'kwalify', + :git => 'git://github.com/puppetlabs/puppetlabs-kwalify.git', + :ref => 'e0079c6485d7cbfc846d956e650913e1b3ccfb6d' +mod 'libvirt', + :git => 'git://github.com/enovance/puppetlabs-libvirt.git', + :ref => '05808874715ca3e899861a0af139e6a48255d3cb' +mod 'limits', + :git => 'git://github.com/enovance/puppet-limits.git', + :ref => '8cb15495e55ce86bacf17f6a80a8c70ac35fc9c0' +mod 'logrotate', + :git => 'git://github.com/enovance/puppet-logrotate.git', + :ref => 'f4d12356301fa2992f51dc7225037bb07556cb28' +mod 'memcached', + :git => 'git://github.com/enovance/puppet-memcached.git', + :ref => 'd009260de3c7623003318555ec5ca61217ea3ca1' +mod 'mongodb', + :git => 'git://github.com/enovance/puppetlabs-mongodb.git', + :ref => 'cb8db6aafa7c55729adb7b35db02315f784ff2ec' +mod 'mysql', + :git => 'git://github.com/enovance/puppetlabs-mysql.git', + :ref => '8b814d4d2cb5786a15e8e37fb3b7444d5d5f0d3f' +# TODO(EmilienM) Come back to upstream after +# https://github.com/ghoneycutt/puppet-module-nfs/pull/43 got merged. +mod 'nfs', + :git => 'git://github.com/enovance/puppet-module-nfs.git', + :ref => '6f840a522679c6a8ebe340d86f9c4325a2103629' +mod 'ntp', + :git => 'git://github.com/enovance/puppetlabs-ntp.git', + :ref => 'eb02ba2937ce86fb609ae41499767244b78ec58d' +mod 'pacemaker', + :git => 'git://github.com/enovance/puppet-pacemaker.git', + :ref => '56bbb3580bb7fa62bf57c2ed7a30b938e42b8cc3' +mod 'postgresql', + :git => 'git://github.com/enovance/puppetlabs-postgresql.git', + :ref => '0b483a2796e77d670e326a01fce57465d2c08774' +mod 'puppetdb', + :git => 'git://github.com/enovance/puppetlabs-puppetdb.git', + :ref => 'b482ad8efa94283099cee0aaedd194f50753f7b0' +mod 'puppetdbquery', + :git => 'git://github.com/enovance/puppet-puppetdbquery.git', + :ref => '89194917744f929bb600c31d7d6f822b529f5f03' +# TODO(EmilienM) come back o upstream after +# https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/306 +mod 'rabbitmq', + :git => 'git://github.com/enovance/puppetlabs-rabbitmq.git', + :ref => '77a79e46f0de3ae10869ccf1b5873fe0bc67e8eb' +mod 'redis', + :git => 'git://github.com/arioch/puppet-redis.git', + :ref => '51e35cc9a743dd8f992effae25d92e18aafe8b46' +mod 'rhnreg_ks', + :git => 'git://github.com/enovance/puppet-rhnreg_ks.git', + :ref => '8fdc051992b44a09f39d3b510d7cd6db5ed5ff66' +mod 'rpcbind', + :git => 'git://github.com/enovance/puppet-module-rpcbind.git', + :ref => 'da943d26f09f9658159c1190e058bf1af88f465d' +mod 'rsync', + :git => 'git://github.com/enovance/puppetlabs-rsync.git', + :ref => '7122983d89bf68bc4170415cc03212f6a8a4636e' +mod 'sensu', + :git => 'git://github.com/enovance/sensu-puppet.git', + :ref => '4a16ebf3503bfc9ae6192ae3120cb29b9e5c8445' +mod 'ssh', + :git => 'git://github.com/enovance/puppet-ssh.git', + :ref => '3906425ff06bcabc4d677a3f01372d8a26f93e94' +mod 'rsyslog', + :git => 'git://github.com/enovance/puppet-rsyslog.git', + :ref => '67c7c501b916ebd1a27a8a218d49602339526c4f' +mod 'stdlib', + :git => 'git://github.com/enovance/puppetlabs-stdlib.git', + :ref => 'fb42396c75d90ce3a9473e2a7ed22682266ea03f' +mod 'sudo', + :git => 'git://github.com/enovance/puppet-sudo.git', + :ref => '6875e3c16bb17149fb24d49d45e8dc32bacbdfaf' +mod 'sysctl', + :git => 'git://github.com/enovance/puppet-sysctl.git', + :ref => 'aca277a3d407359ced96267cd2b3205bd8ab9c48' +mod 'types', + :git => 'git://github.com/enovance/puppet-module-types.git', + :ref => '4c58ae8b6cdb1a9da3da9654a35375e274019dfb' +mod 'uchiwa', + :git => 'git://github.com/enovance/yelp-uchiwa.git', + :ref => '8eafd8167ff7d4f1cd696e4d098e3e1497c28279' +mod 'vswitch', + :git => 'git://github.com/enovance/puppet-vswitch.git', + :ref => '49dbaff15e8f017dbe365ebf08eb505472b695a1' +mod 'wget', + :git => 'git://github.com/enovance/puppet-wget.git', + :ref => '1c3ea6f1c822a99b52defb87305ea5977cba4293' +mod 'xinetd', + :git => 'git://github.com/enovance/puppetlabs-xinetd.git', + :ref => '0740f5343b54523d9ed27f65c05f6c9f045f022b' +mod 'openstack_extras', + :git => 'git://github.com/enovance/puppet-openstack_extras.git', + :ref => '537ed9e3750178fcfffa3ae476727cb1f4e65fb9' +mod 'staging', + :git => 'git://github.com/enovance/puppet-staging.git', + :ref => 'bc434a71e19aae54223d57c274e2e1a7f9546d5e' diff --git a/Rakefile b/Rakefile index 454c013f..447199e3 100644 --- a/Rakefile +++ b/Rakefile @@ -7,7 +7,6 @@ TDIR = File.expand_path(File.dirname(__FILE__)) require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-lint/tasks/puppet-lint' require 'puppet-syntax/tasks/puppet-syntax' -require 'net/http' PuppetLint.configuration.fail_on_warnings = true PuppetLint.configuration.send('disable_80chars') @@ -58,20 +57,9 @@ namespace :module do end end -puppetfile_url = ENV['PUPPETFILE'] || 'https://raw.githubusercontent.com/redhat-openstack/openstack-puppet-modules/enovance-J.1.1.0/Puppetfile' - Rake::Task[:spec_prep].clear desc 'Create the fixtures directory' task :spec_prep do - puts "Puppetfile: #{puppetfile_url}" - # If puppetfile exist on local fs, let use this file (provided by Puppetfile env arg) - if !File.exists?(puppetfile_url) - uri = URI.parse(puppetfile_url) - puppetfile = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https').request(Net::HTTP::Get.new(uri.request_uri)).body - else - puppetfile = open(puppetfile_url).read - end - File.open('Puppetfile', 'w') { |file| file.write(puppetfile) } FileUtils::mkdir_p('spec/fixtures/modules') FileUtils::mkdir_p('spec/fixtures/manifests') FileUtils::touch('spec/fixtures/manifests/site.pp')