r10k 1.5.1 → 2.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTUyZGI3NDlmOTVkZTNjMjhkMThmNjNiMGQ1NzlkMjg4YzAzZTZlMA==
+  data.tar.gz: !binary |-
+    NzFhY2VkNWU1M2JhMzI1ZmFmZTQ1YzIyNTRjZjA5YzliMDY2MTRhZQ==
+SHA512:
+  metadata.gz: !binary |-
+    MDUxZjBkYmQxOWNhOTBhMDgyNWY0NWIzYzZhOGNjODM4YWJiMzEzMDQ5OWE1
+    YTViZGUxOWU4YTllMzZkMDY2NWViZTE4MzMzNDY5YzIwYzMyZjczNDNlOTJh
+    MWUyZjM0OWM5NWRmNWIzZDJjZWU5ZDAzYjdhYWVmMDRlYTIxNjA=
+  data.tar.gz: !binary |-
+    MTIwMjc2Njg2NzBhNTQ3NDVhYmRiOWY5ZmNlYjY1Y2NlYWYzNjI2ZjRjMWUz
+    NDg0YWU5ODUwNTY4Y2YxNjRjY2Q3N2IyNThiOWEyNzQ2NzU1NWYzMTZhMzNj
+    N2Q2NzVmMDhlYTMzZGU0NGI2NDUzNjhiNWQzMmI0NWNkMjk5YWQ=

data/.travis.yml

@@ -10,4 +10,3 @@ rvm:
   - "2.1.0"
   - "2.0.0"
   - "1.9.3"
-  - "1.8.7"

data/CHANGELOG.mkd

@@ -1,6 +1,69 @@
 CHANGELOG
 =========
 
+2.0.0
+-----
+
+2015/06/08
+
+This is a backwards incompatible feature release, but as major releases go this
+is a pretty small one. Some changes introduced into master included some
+breaking changes and SemVer dictates that we do a major release in this case.
+Actual changes that will affect end users should be limited; the only one that
+should have big impact is the removal of Ruby 1.8.7 support. Any other issues
+encountered should be treated as bugs and will be fixed.
+
+### User notes
+
+(GH-1) Native support for installing modules from the Puppet Forge
+
+R10k can now directly install modules from the Puppet Forge, rather than
+shelling out to the Puppet module tool. This will allow for later optimizations
+like caching module downloads to speed up installing module across multiple
+environments.
+
+(RK-83) Allow '-' as a module name separator
+
+(RK-53) Remove '/etc/r10k.yaml' from config file search path.
+
+R10k 1.5.0 added '/etc/puppetlabs/r10k/r10k.yaml' to the paths checked while
+looking for a config file, in order to keep in convention with the rest of the
+Puppet Labs config files. In 2.0.0 the old location, '/etc/r10k.yaml', has been
+removed.
+
+(RK-57) Notify users of purgedirs key deprecation
+
+The purgedirs key was used in r10k 0.0.9 but has not been used in the 1.x
+release series; if this setting is given then r10k will generate a warning
+indicating that it is not used.
+
+### Deprecations/Removals
+
+(RK-47) Remove support for Ruby 1.8.7
+
+Given that Ruby 1.8.7 has been EOL for nearly two years, it's time for r10k to
+drop support for 1.8.7 as well. The Puppet 4 all in one package ships with Ruby
+2.1.6, so even if you're on a platform that doesn't have Ruby 1.9 or greater you
+can install r10k into the Puppet collection environment and used the bundled
+Ruby.
+
+(RK-54) Remove deprecated subcommands
+
+R10k 1.0.0 reorganized a number of subcommands but retained the old subcommand
+names for compatibility with 0.0.x; since it's been over 2 years since 1.0.0 has
+been released these commands have finally been removed.
+
+(RK-113) Remove deprecated Task classes and namespaces
+
+The R10K::Task namespace turned out to be unwieldy in practice and has been
+replaced with the R10K::Action namespace. Use that for running r10k as an
+application.
+
+(RK-114) Remove deprecated git classes
+
+The reorganization of the Git code in 1.5.0 rendered a number of classes
+obsolete; they've been removed.
+
 1.5.1
 -----
 

data/Gemfile

@@ -3,11 +3,11 @@ source 'https://rubygems.org'
 gemspec
 
 group :extra do
-  gem 'rugged', '~> 0.21.4' if RUBY_VERSION > '1.8.7'
+  gem 'rugged', '~> 0.21.4'
 end
 
 group :development do
-  gem 'simplecov', '~> 0.9.1' if RUBY_VERSION > '1.8.7'
+  gem 'simplecov', '~> 0.9.1'
 end
 
 if File.exists? "#{__FILE__}.local"

data/README.mkd

@@ -19,8 +19,7 @@ Requirements
 
 R10k supports the following Ruby versions:
 
-  - 1.8.7 (POSIX minimum version, deprecated)
-  - 1.9.3 (Windows minimum version)
+  - 1.9.3
   - 2.0.0
   - 2.1.0
 
@@ -32,14 +31,6 @@ environments and modules.
   - Git is required for creating environments and modules from Git
   - SVN is required for creating environments and modules from SVN
 
-### Ruby 1.8.7 is deprecated
-
-As of r10k 1.5.0, support for Ruby 1.8.7 is deprecated. Because of the
-increasing cost of supporting Ruby 1.8.7, issues only affecting 1.8.7 will be
-fixed but will have a lower priority.
-
-Support for 1.8.7 will be dropped entirely in r10k 2.0.0.
-
 Installation
 ------------
 

data/doc/dynamic-environments/configuration.mkd

@@ -21,13 +21,12 @@ locations for a configuration file.
 
   * `{current working directory}/r10k.yaml`
   * `/etc/puppetlabs/r10k/r10k.yaml` (1.5.0 and later)
-  * `/etc/r10k.yaml` (deprecated in 1.5.0)
+  * `/etc/r10k.yaml` (removed in 2.0.0, deprecated in 1.5.0)
 
-In 1.5.0 r10k added `/etc/puppetlabs/r10k/r10k.yaml` to the configuration search
-path. The old location, `/etc/r10k.yaml` has been deprecated in favor of the new
-location. If both `/etc/puppetlabs/r10k/r10k.yaml` and `/etc/r10k.yaml` exist
-and explicit configuration file has not been given, r10k will log a warning and
-use `/etc/puppetlabs/r10k/r10.yaml`.
+As of 2.0.0, r10k will no longer search for a configuration file at
+`/etc/r10k.yaml`. In 1.5.0 r10k added `/etc/puppetlabs/r10k/r10k.yaml` to the
+configuration search path. The old location, `/etc/r10k.yaml` was deprecated
+at that time.
 
 General options
 ---------------
@@ -68,6 +67,25 @@ git:
 See the [git provider documentation](../git/providers.mkd) for more information
 regarding Git providers.
 
+### forge
+
+The 'forge' setting is a hash that contains settings for downloading modules
+from the Puppet Forge.
+
+#### proxy
+
+The proxy option sets an optional HTTP proxy to use when downloading modules
+from the Forge.
+
+```yaml
+forge:
+  proxy: 'http://my-site.proxy:3128'
+```
+
+If no proxy is given, r10k will check the environment variables 'HTTPS_PROXY',
+'https_proxy', 'HTTP_PROXY', and 'http_proxy' in that order for a proxy URL.
+
+
 Deployment options
 ------------------
 

data/doc/dynamic-environments/quickstart.mkd

@@ -117,7 +117,7 @@ Install r10k via Ruby Gems.
 gem install r10k
 ```
 
-Configure r10k by editing `/etc/r10k.yaml` and ensuring it has the following contents:
+Configure r10k by editing `/etc/puppetlabs/r10k/r10k.yaml` and ensuring it has the following contents:
 
 ```
 # The location to use for storing cached Git repos

data/integration/Gemfile

@@ -1,3 +1,3 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-gem 'beaker', '~> 2.7.1'
+gem 'beaker', '~> 2.7'

data/integration/configs/pe/centos-5-64mda

@@ -0,0 +1,25 @@
+HOSTS:
+  centos-5-x86_64-master:
+    roles:
+      - master
+      - dashboard
+      - database
+      - agent
+    platform: el-5-x86_64
+    template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64
+    hypervisor: vcloud
+  centos-5-x86_64-agent:
+    roles:
+      - agent
+      - frictionless
+    platform: el-5-x86_64
+    template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64
+    hypervisor: vcloud
+CONFIG:
+  nfs_server: none
+  consoleport: 443
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vmpooler.delivery.puppetlabs.net/
+  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/centos-6-64mda

@@ -1,5 +1,5 @@
 HOSTS:
-  centos-6-x86_64:
+  centos-6-x86_64-master:
     roles:
       - master
       - dashboard

data/integration/configs/pe/centos-7-64mda

@@ -1,5 +1,5 @@
 HOSTS:
-  centos-7-x86_64:
+  centos-7-x86_64-master:
     roles:
       - master
       - dashboard

data/integration/configs/pe/debian-6-64mda

@@ -1,5 +1,5 @@
 HOSTS:
-  debian-6-amd64:
+  debian-6-amd64-master:
     roles:
       - master
       - dashboard

data/integration/configs/pe/debian-7-64mda

@@ -1,5 +1,5 @@
 HOSTS:
-  debian-7-amd64:
+  debian-7-amd64-master:
     roles:
       - master
       - dashboard

data/integration/configs/pe/redhat-6-64mda

@@ -1,5 +1,5 @@
 HOSTS:
-  redhat-6-x86_64:
+  redhat-6-x86_64-master:
     roles:
       - master
       - dashboard

data/integration/configs/pe/redhat-7-64mda

@@ -1,5 +1,5 @@
 HOSTS:
-  redhat-7-x86_64:
+  redhat-7-x86_64-master:
     roles:
       - master
       - dashboard

data/integration/configs/pe/sles-11-64mda

@@ -1,5 +1,5 @@
 HOSTS:
-  sles-11-x86_64:
+  sles-11-x86_64-master:
     roles:
       - master
       - dashboard

data/integration/configs/pe/sles-12-64mda

@@ -0,0 +1,25 @@
+HOSTS:
+  sles-12-x86_64-master:
+    roles:
+      - master
+      - dashboard
+      - database
+      - agent
+    platform: sles-12-x86_64
+    template: Delivery/Quality Assurance/Templates/vCloud/sles-12-x86_64
+    hypervisor: vcloud
+  sles-12-x86_64-agent:
+    roles:
+      - agent
+      - frictionless
+    platform: sles-12-x86_64
+    template: Delivery/Quality Assurance/Templates/vCloud/sles-12-x86_64
+    hypervisor: vcloud
+CONFIG:
+  nfs_server: none
+  consoleport: 443
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vmpooler.delivery.puppetlabs.net/
+  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/ubuntu-1004-64mda

@@ -1,5 +1,5 @@
 HOSTS:
-  ubuntu-1004-amd64:
+  ubuntu-1004-amd64-master:
     roles:
       - master
       - dashboard

data/integration/configs/pe/ubuntu-1204-64mda

@@ -1,5 +1,5 @@
 HOSTS:
-  ubuntu-1204-amd64:
+  ubuntu-1204-amd64-master:
     roles:
       - master
       - dashboard

data/integration/configs/pe/ubuntu-1404-64mda

@@ -1,5 +1,5 @@
 HOSTS:
-  ubuntu-1404-amd64:
+  ubuntu-1404-amd64-master:
     roles:
       - master
       - dashboard

data/integration/files/pre-suite/git_config.pp.erb

@@ -0,0 +1,19 @@
+$git_package = $osfamily ? {
+  'Debian' => 'git-core',
+  default  => 'git'
+}
+class { 'git':
+  package_name => $git_package
+}
+->
+git::config { 'user.name':
+  value => 'Tester',
+}
+->
+git::config { 'user.email':
+  value => 'tester@puppetlabs.com',
+}
+->
+file { '<%= git_repo_path %>':
+  ensure => directory
+}

data/integration/pre-suite/01_git_config.rb

@@ -1,3 +1,4 @@
+require 'erb'
 require 'git_utils'
 require 'r10k_utils'
 require 'master_manipulator'
@@ -13,6 +14,10 @@ git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
 git_control_remote_head_path = File.join(git_control_remote, 'HEAD')
 git_environments_path = File.join('/root', git_repo_name)
 
+local_files_root_path = ENV['FILES'] || 'files'
+git_manifest_template_path = File.join(local_files_root_path, 'pre-suite', 'git_config.pp.erb')
+git_manifest = ERB.new(File.read(git_manifest_template_path)).result(binding)
+
 step 'Get PE Version'
 pe_major = on(master, 'facter -p pe_major_version').stdout.rstrip
 pe_minor = on(master, 'facter -p pe_minor_version').stdout.rstrip
@@ -22,23 +27,6 @@ if pe_version < 3.7
   fail_test('This pre-suite requires PE 3.7 or above!')
 end
 
-#In-line files
-git_manifest = <<-MANIFEST
-class { 'git': }
-->
-git::config { 'user.name':
-  value => 'Tester',
-}
-->
-git::config { 'user.email':
-  value => 'tester@puppetlabs.com',
-}
-->
-file { '#{git_repo_path}':
-  ensure => directory
-}
-MANIFEST
-
 #Setup
 step 'Stub Forge on Master'
 stub_forge_on(master)

data/integration/pre-suite/02_pe_r10k.rb

@@ -40,8 +40,6 @@ on(master, "rm -rf #{prod_env_path}")
 step 'Configure r10k'
 create_remote_file(master, r10k_config_path, r10k_conf)
 on(master, "chmod 644 #{r10k_config_path}")
-#Work-a-round until CODEMGMT-110 is resolved
-on(master, "ln -s #{r10k_config_path} /etc/r10k.yaml")
 
 step 'Deploy "production" Environment via r10k'
 on(master, 'r10k deploy environment -v')

data/integration/scripts/README.mkd

@@ -0,0 +1,86 @@
+Scripts
+=======
+
+This folder contains helper scripts for setting up manual testing environments
+using [Beaker](https://github.com/puppetlabs/beaker) configuration files. The
+environments created by these scripts have "r10k" fully configured along with
+a Git repository with a valid "production" environment.
+
+These scripts are specific to the Puppet Labs environment and will not work in
+other environments without alteration!
+
+## Prerequisites
+
+To utilize this test scripts you will need to have Ruby 1.9.3 or greater
+installed on your system along with Bundler. Also, the scripts utilize the
+"vmpooler" for virtual machine creation. Access to the "vmpooler" machines
+require having valid SSH private keys located on your local computer. Speak
+with a QA team member for more information on where to find the necessary
+SSH keys.
+
+## Usage
+
+The scripts are written in Bash and should run on any Linux or Mac system as
+long as the prerequisites mentioned above are satisfied.
+
+### Cloning
+
+First you will need to clone the "[r10k](https://github.com/puppetlabs/r10k)" repository on your local machine:
+
+```bash
+git clone git@github.com:puppetlabs/r10k.git
+```
+
+### Executing Script
+
+Navigate to the integration tests "scripts" folder of the "r10k" repository
+clone:
+
+```bash
+cd r10k/integration/scripts
+```
+
+There are separate scripts for each supported platform. Select a desired
+platform and execute the script:
+
+```bash
+bash setup_r10k_env_centos6.sh
+```
+
+## Connecting to Machines
+
+The setup process takes about 10 minutes to complete. Once finished Beaker
+will report that all tests have been run successfully. The output log will
+list the machines created. The Puppet master will have a name ending with
+"-master" which you can scrape from the Beaker console output. Example:
+
+```
+a9lrs93vnujsrrg.delivery.puppetlabs.net (centos-6-x86_64-master) executed in 1.26 seconds
+```
+
+The FQDN of the Puppet master ("a9lrs93vnujsrrg.delivery.puppetlabs.net" in the
+above example) will be printed to the left of the machine tag. The machine tag
+is a combination of the platform and role of the virtual machine.
+
+Now that you have the FQDN you can connect to the machine using SSH:
+
+```bash
+ssh -i private_key root@a9lrs93vnujsrrg.delivery.puppetlabs.net
+```
+
+*Note:* The correct SSH private key needs to be installed on your local machine
+first. Speak with a QA representative to get the correct key for "vmpooler"
+machines.
+
+## Configuration Details
+
+Now that you have successfully connected to the Puppet master you can begin
+manual testing. The script has configured Git on the Puppet master to provide
+a working "production" environment for "r10k" testing. The Git repository
+serving the Puppet environments is located at "/git_repos/environments.git".
+There is a Git clone of the remote repository located at "/root/environments".
+
+When performing manual "r10k" testing you should utilize the Git clone
+repository located at "/root/environments". The "r10k" configuration file
+"/etc/puppetlabs/r10k/r10k.yaml" is already configured to use the remote Git
+repository for deployments.