Develop (#6)

* Testing deployment location logic for when in CircleCI

* Testing deployment location logic for when in CircleCI Part 2

* Updated comment [skip ci]

* Moved Label up in Dockerfile [skip ci]

Author: LevonBecker

.kitchen.yml

@@ -160,11 +160,6 @@ suites:
         chef_version: '12.19.36'
         inside_aws: 'true'
         configure_sudoers: 'true'
-    attributes:
-        bonusbits_base:
-          deployment_type: ec2
-          aws:
-            inside: true
     includes: ["amazon-ec2"]
 
   - name: ec2_base_epel_repo
@@ -211,11 +206,6 @@ suites:
         configure_sudoers: 'true'
         configure_epel: 'true'
         install_epel_packages: 'true'
-    attributes:
-        bonusbits_base:
-          deployment_type: ec2
-          aws:
-            inside: true
     includes: ["amazon-ec2"]
 
   - name: ec2_base_no_software
@@ -262,11 +252,6 @@ suites:
         configure_cloudwatch_logs: 'true'
         inside_aws: 'true'
         install_packages: 'false'
-    attributes:
-        bonusbits_base:
-          deployment_type: ec2
-          aws:
-            inside: true
     includes: ["amazon-ec2"]
 
   - name: docker_base
@@ -283,16 +268,12 @@ suites:
           git: https://github.com/bonusbits/inspec_bonusbits_base.git
       attributes:
         chef_version: '12.19.36'
-        inside_aws: 'false'
         configure_sudoers: 'true'
     attributes:
+      <% if ENV['CIRCLECI'] %>
       bonusbits_base:
-        deployment_type: docker
-        security:
-          selinux:
-            configure: false
-        aws:
-          inside: false
+        deployment_location: 'circleci'
+      <% end %>
     includes: ["amazon-docker"]
 
   - name: docker_base_epel_repo
@@ -309,18 +290,14 @@ suites:
           git: https://github.com/bonusbits/inspec_bonusbits_base.git
       attributes:
         chef_version: '12.19.36'
-        inside_aws: 'false'
         configure_sudoers: 'true'
         configure_epel: 'true'
         install_epel_packages: 'true'
     attributes:
+      <% if ENV['CIRCLECI'] %>
       bonusbits_base:
-        deployment_type: docker
-        security:
-          selinux:
-            configure: false
-        aws:
-          inside: false
+        deployment_location: 'circleci'
+      <% end %>
     includes: ["amazon-docker"]
 
   - name: docker_base_no_software
@@ -341,11 +318,8 @@ suites:
         install_packages: 'false'
         configure_sudoers: 'true'
     attributes:
+      <% if ENV['CIRCLECI'] %>
       bonusbits_base:
-        deployment_type: docker
-        security:
-          selinux:
-            configure: false
-        aws:
-          inside: false
+        deployment_location: 'circleci'
+      <% end %>
     includes: ["amazon-docker"]

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## CHANGE LOG
 
+## 2.1.9 - 04/15/2017 - Levon Becker
+* Removed unnecessary attributes in kitchen config now that auto deployment discovery wrote.
+* Fixed CircleCI detection
+* Conditioned Selinux to not run if Docker
+
 ## 2.1.8 - 04/15/2017 - Levon Becker
 * Set to start awslogs at end of cloudwatch_logs recipe so it'll start streaming chef-client.log 
 

Dockerfile

@@ -1,5 +1,9 @@
 FROM amazonlinux:latest
 MAINTAINER Levon Becker "[email protected]"
+LABEL version="2.1.9" \
+      description="Amazon Linux Image built from bonusbits_base cookbook." \
+      github="https://github.com/bonusbits/bonusbits_base" \
+      website="https://www.bonusbits.com"
 
 # Build Cookbook Args
 #ARG chef_client_version=12.19.36
@@ -9,11 +13,6 @@ ARG chef_role=base
 ARG chef_environment=bonusbits_base
 ARG chef_config_path=/opt/chef-repo
 
-LABEL version="2.1.8" \
-      description="Amazon Linux Image built from bonusbits_base cookbook." \
-      github="https://github.com/bonusbits/bonusbits_base" \
-      website="https://www.bonusbits.com"
-
 # Install Basics
 RUN yum clean all
 RUN yum update -y --exclude=kernel*

attributes/default.rb

@@ -27,6 +27,8 @@
   end
 
 # Determine Deployment Location
+## Circleci Logic Does not work if spawning Docker
+## containers in CircleCi because nested VM. Override in Kitchen Config
 default['bonusbits_base']['deployment_location'] =
   if ENV['CIRCLECI']
     'circleci'

metadata.rb

@@ -4,7 +4,7 @@
 license 'MIT'
 description 'Foundation Wrapper Cookbook for all Nodes'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '2.1.8'
+version '2.1.9'
 chef_version '~> 12.5' if respond_to?(:chef_version)
 source_url 'https://github.com/bonusbits/bonusbits_base'
 issues_url 'https://github.com/bonusbits/bonusbits_base/issues'

recipes/security.rb

@@ -1,10 +1,14 @@
+deployment_type = node['bonusbits_base']['deployment_type']
+deployment_type_docker = deployment_type == 'docker'
+
 case node['os']
 when 'linux'
   case node['platform_family']
   when 'redhat'
     # Configure SELinux
     selinux_state 'Disabling SELinux' do
       action node['bonusbits_base']['linux']['selinux']['action'].to_sym
+      not_if { deployment_type_docker }
     end
   else
     return