diff --git a/Puppetfile b/Puppetfile deleted file mode 100644 index 1274d5ac..00000000 --- a/Puppetfile +++ /dev/null @@ -1,195 +0,0 @@ -# -# 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 => 'c374bed10f8af6000601fa407ebaef0833e1999c' -mod 'ceilometer', - :git => 'git://github.com/enovance/puppet-ceilometer.git', - :ref => '957c2120d0ee0b9db08bfddcce996686ba61d97d' -mod 'cinder', - :git => 'git://github.com/enovance/puppet-cinder.git', - :ref => 'c9271e02d0d5a317ab390cfce9928601208f6073' -mod 'glance', - :git => 'git://github.com/enovance/puppet-glance.git', - :ref => '78042d76c0854e16a55aaf05c03696d4d422e3c5' -mod 'heat', - :git => 'git://github.com/enovance/puppet-heat.git', - :ref => '0e6d7eacecd70819384ac61ea3b9df38b90411b0' -mod 'horizon', - :git => 'git://github.com/enovance/puppet-horizon.git', - :ref => '16b482ea21a70d8dd06ab4c98ac5a218399b0213' -mod 'keystone', - :git => 'git://github.com/enovance/puppet-keystone.git', - :ref => '45ac386600c0e79942834da8b69bf09a4809d7bd' -mod 'neutron', - :git => 'git://github.com/enovance/puppet-neutron.git', - :ref => 'cefbdc897d70fd1c1fc44e372f05336674efd940' -mod 'nova', - :git => 'git://github.com/enovance/puppet-nova.git', - :ref => '3ffc5a263113232230b69e621e1b6167f2148390' -mod 'swift', - :git => 'git://github.com/enovance/puppet-swift.git', - :ref => '3ea00440361ff2452561d2cce808d938e39cce56' -mod 'trove', - :git => 'git://github.com/enovance/puppet-trove.git', - :ref => '7d9db32423b25dcc227ea6a6d43c90c63fde0d58' - -# Dependency -mod 'apache', - :git => 'git://github.com/enovance/puppetlabs-apache.git', - :ref => '58682faf74cdfc6c8d921d2be9322368c8a96cf9' -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 => 'c50d91a6f790058a2b6975d6e1d6189f7c8b6687' -#FIXME -mod 'cloud', - :git => 'git://github.com/enovance/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 => '04356974f72b90a1d0f57346a00e95a717924e43' -mod 'corosync', - :git => 'git://github.com/enovance/puppetlabs-corosync.git', - :ref => '79b61302b07fef30b65a42f3b55229616018aacf' -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 'firewall', - :git => 'git://github.com/enovance/puppetlabs-firewall.git', - :ref => '4ed1b43e1629c1b6108133b0fc3be603d03ffe6c' -mod 'fluentd', - :git => 'git://github.com/enovance/puppet-fluentd.git', - :ref => 'd073a97002c569d8bfc38ac814ee33ed2cb13ca6' -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 => '64fb5f898a0f062ebf188e53ba613b3b13e9d829' -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 '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 => 'e3cc9a0ea895f6e01801e4620799c66c2337b7ed' -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 'puppetdbquery', - :git => 'git://github.com/enovance/puppet-puppetdbquery.git', - :ref => '89194917744f929bb600c31d7d6f822b529f5f03' -mod 'rabbitmq', - :git => 'git://github.com/enovance/puppetlabs-rabbitmq.git', - :ref => '25420cb3c26c9a8432ab519d43c094d614d4fec4' -mod 'redis', - :git => 'git://github.com/enovance/puppet-redis.git', - :ref => '1b2b2cea8c9acc08cfa01b42e47fad17f3c4d03d' -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 => '10675c0d80511a8cdd514af67b695887fa97ec40' -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 'sysctl', - :git => 'git://github.com/enovance/puppet-sysctl.git', - :ref => '4a463384e844f51b270428643a5b8beb3628e854' -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' diff --git a/README.md b/README.md index ff1bc6c7..8decfd42 100644 --- a/README.md +++ b/README.md @@ -89,8 +89,9 @@ The swift portions of this module needs Puppet's [exported resources](http://doc ### Installing latest unstable cloud module from source cd /etc/puppet/modules - git clone git@github.com:enovance/puppet-openstack-cloud.git cloud - cd cloud + git clone git@github.com:redhat-openstack/openstack-puppet-modules.git modules + cd modules + git checkout -b puppet-openstack-cloud origin/enovance gem install --no-ri --no-rdoc r10k # a debian package is available in jessie PUPPETFILE=./Puppetfile PUPPETFILE_DIR=../ r10k --verbose 3 puppetfile install diff --git a/Rakefile b/Rakefile index 447199e3..71731ec4 100644 --- a/Rakefile +++ b/Rakefile @@ -7,6 +7,7 @@ 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') @@ -57,9 +58,18 @@ namespace :module do end end +puppetfile_url = ENV['PUPPETFILE'] || 'https://raw.githubusercontent.com/redhat-openstack/openstack-puppet-modules/enovance/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 + 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')