pupistry 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 732d292847fab362692d6118e33d286e1c50f4bb
-  data.tar.gz: 5992f7c0698262d35b2a357b978821c23da7cbb8
+  metadata.gz: 040c9a706127947909dc602972b7e9cbd28ebe42
+  data.tar.gz: 864c4368a6ae0d3103b4ca50d9cc987e135b077c
 SHA512:
-  metadata.gz: 2591da8ee00435744fa2cb97357f88cba20e7bd3f1ab7b7148a158f4dcaea8d60f806dcb93a320995c7738b7a41684d225688cc60ab4cd00a5a1c72fdb709c3b
-  data.tar.gz: bda64095f11c6ce61ceb6fffa42238f9d029ab07d829805a91d207f8efb86cdda39496252dd2c869f02b92a8f48c68cd9a907294ede2fbfc57906d8d2ebbcf67
+  metadata.gz: 82f9c81beee09687e742c95fd49107b1e13edb75752f24546770a72d05f944b35f4ee3513c27b6e91f9f0bd017169ce874a52cb41866c6fe6f3dbf0bb0b10135
+  data.tar.gz: af932b06e1cef3f9f64dec3dc074e5276eb8aab4897854d8013b693c8e92aa463452b384f6041d06821e8c6fa3ba20dcb0cafcb7812fcb84124c4f46139d598b

data/README.md

@@ -1,7 +1,14 @@
 # WORK IN PROGRESS
 
 This project is currently in progress and not all of this documentation reflects
-where it is really at. Use this at your own peril/madness.
+where it is really at. Use this at your own peril/madness. In theory, everything
+currently works, but there will be bugs and areas of the documentation that may
+not make sense.
+
+I've marked anything I can that is in progress with TODO and workarounds/notes
+where I can. It's all under development ATM so it's changing really fast, but
+I'll happily take pull requests at even this early stage.
+
 
 # pupistry
 
@@ -193,6 +200,7 @@ needing to create explicit IAM credentials for the agents/servers.
 
 The following is the expected minmum structure of the Puppetcode repository to
 enable it to work with Pupistry:
+
     /Puppetfile
     /hiera.yaml
     /manifests/site.pp
@@ -201,6 +209,7 @@ Puppetfile is standard r10k and site.pp is standard Puppet. The Hiera config
 is generally normal, but you do need to define a datadir to tell Puppet to look
 where the puppetcode gets unpacked to. Generally the following sample Hiera
 will do the trick:
+
     ---
     :backends: yaml
     :yaml:
@@ -211,8 +220,9 @@ will do the trick:
      - common
 
 Then in Pupistry, the following configuration should be used for the agent (or
-subsitute /etc/puppet/ for wherever your platform has %{::settings::confdir}
+subsitute `/etc/puppet/` for wherever your platform has `%{::settings::confdir}`
 set to).
+
       agent:
         puppetcode: /etc/puppet/environments
 
@@ -222,16 +232,17 @@ and override on a per-execution basis.
 
 You'll notice pretty quickly if something is broken when doing `puppet apply`
 
+Confused? No worried, check out the sample repo that shows a very simple setup.
+You can copy this and start your own Puppet adventure, just add in your modules
+to Puppetfile and add them to the relevent machines in manifests/site.pp.
+
+https://github.com/jethrocarr/pupistry-samplepuppet 
 
 
 TODO: Longer term intend to add support for various popular structure, but
 for now it is what it is. It's not hard, check out bin/puppistry and send
 pull requests.
 
-TODO: Provide an example repo to build from.... or maybe have smarter
-assistance in the app to check for files and find them or generate defaults
-if missing (eg hiera)
-
 
 ### Helper Module
 
@@ -269,7 +280,34 @@ it - enjoy!
 TODO: Currently being worked on, for now the following is a rough example of
 what you can do to bootstrap a RHEL/CentOS7 box:
 
+    rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm
+    rpm -ivh http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
 
+    yum update --assumeyes
+    yum install --assumeyes puppet ruby-devel rubygems
+    yum install --assumeyes gcc zlib-devel libxml2-devel patch
+
+    gem install pupistry
+    mkdir /etc/pupistry
+    cat > /etc/pupistry/settings.yaml << "EOF"
+    general:
+      app_cache: ~/.pupistry/cache
+      s3_bucket: example
+      s3_prefix:
+      gpg_disable: true
+      gpg_signing_key: XXXXX
+    agent:
+      puppetcode: /etc/puppet/environments
+      access_key_id: 
+      secret_access_key: 
+      region: ap-southeast-2
+      proxy_uri:
+    EOF
+    pupistry apply --verbose
+
+It will setup the Puppet repo for RHEL 7, install updates (remember that security
+thing?) and then install the gem (and deps to build it). Then we generate the
+minimal configuration file needed, and kick off a Puppet run!
 
 
 
@@ -393,5 +431,11 @@ Beer welcome.
 
 # License
 
-Pupistry is licensed under the Apache License, Version 2.0.
+Pupistry is licensed under the Apache License, Version 2.0 (the "License").
+See the `LICENSE.txt` or 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.

data/lib/pupistry/artifact.rb

@@ -59,7 +59,7 @@ module Pupistry
       # Execute R10k with the provided configuration
       $logger.debug "Executing r10k"
 
-      if system "r10k deploy environment -c #{$config["general"]["app_cache"]}/r10kconfig.yaml -pv"
+      if system "r10k deploy environment -c #{$config["general"]["app_cache"]}/r10kconfig.yaml -pv debug"
         $logger.info "r10k run completed"
       else
         $logger.error "r10k run failed, unable to generate artifact"
@@ -217,7 +217,7 @@ module Pupistry
       # Only worth doing this step if they've explicitly set their AWS IAM credentials
       # for the agent, which should be everyone except for IAM role users.
 
-      if $config["agent"]["aws_access_id"]
+      if $config["agent"]["access_key_id"]
         fetch_artifact
       else
         $logger.warn "The agent's AWS credentials are unset on this machine, unable to do download test to check permissions for you."

data/settings.example.yaml

@@ -54,7 +54,7 @@ build:
 
   # Define the Git repo for the Puppet manifest & r10k data
   # (ie repo where your Puppetfile & site.pp is)
-  puppetcode: git@bitbucket.org:user/example.git
+  puppetcode: git@github.com:jethrocarr/pupistry-samplepuppet.git
 
 
   # The AWS credentials with write permission to the S3 bucket for uploading

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pupistry
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jethro Carr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1