Skip to content

Instantly share code, notes, and snippets.

module.aurora_1.data.template_file.auto_created_monitoring_role_arn: Refreshing state...
module.aurora_1.data.aws_caller_identity.current: Refreshing state...
module.aurora_1.data.aws_region.current: Refreshing state...
data.aws_vpc.default: Refreshing state...
module.aurora_1.data.aws_iam_policy_document.enhanced_monitoring_role: Refreshing state...
data.aws_subnet_ids.default: Refreshing state...
An execution plan has been generated and is shown below.
Resource actions are indicated with the following symbols:
+ create
@domcleal
domcleal / README.md
Last active May 8, 2017 13:32
Resolve simple git merge/rebase conflicts

Setup

  1. git clone https://gist.github.com/abef31ca104ecffa2d99fb904aadcf59.git git-merging
  2. cd git-merging

Merging

Merge the change-value branch into master, to bring in the change of value:

  1. git merge origin/change-value will fail with "Automatic merge failed; fix
module Nslcd =
let eol = Util.eol
let map_names = /passwd/
let key_name = /[^ #\n\t\/][^ #\n\t\/]+/
let spc = del /[ \t]+/ " "
let map_entry =
[ key /map/ . spc . [ key map_names . spc . [ key key_name . spc . store Rx.no_spaces] ] .eol ]+
@domcleal
domcleal / .gitignore
Last active April 20, 2017 11:59
Copy part of an Augeas XML tree into another file
output.xml
diff --git a/spec/fixtures/modules/relationships/manifests/titles.pp b/spec/fixtures/modules/relationships/manifests/titles.pp
index 5342aab..3951b88 100644
--- a/spec/fixtures/modules/relationships/manifests/titles.pp
+++ b/spec/fixtures/modules/relationships/manifests/titles.pp
@@ -8,4 +8,11 @@ class relationships::titles {
ensure => running,
name => "svc-name",
}
+
+ exec { 'foo_bar_1':
fail("Usage: move_types_to_parameters.rb MANIFEST_PP CLASS_NAME") if ARGV.length != 2
original_params = File.read(ARGV[0]).lines.map do |line|
$1 if line =~ /\A \$(\w+)\s+=.*,$/
end.compact
require 'kafo_parsers/puppet_strings_module_parser'
hash = KafoParsers::PuppetStringsModuleParser.parse(ARGV.first)
original_params.each do |param|
make: Entering directory '/home/dcleal/code/foreman/hammer_cli_foreman_bootdisk/locale'
bundle exec rake gettext:find
(in /home/dcleal/code/foreman/hammer_cli_foreman_bootdisk)
rm -f /home/dcleal/code/foreman/hammer_cli_foreman_bootdisk/lib/hammer_cli_foreman_bootdisk/../../locale/en_GB/hammer_cli_foreman_bootdisk.edit.po
cp /home/dcleal/code/foreman/hammer_cli_foreman_bootdisk/lib/hammer_cli_foreman_bootdisk/../../locale/en_GB/hammer_cli_foreman_bootdisk.po /home/dcleal/code/foreman/hammer_cli_foreman_bootdisk/lib/hammer_cli_foreman_bootdisk/../../locale/en_GB/hammer_cli_foreman_bootdisk.edit.po
touch /home/dcleal/code/foreman/hammer_cli_foreman_bootdisk/lib/hammer_cli_foreman_bootdisk/../../locale/en_GB/hammer_cli_foreman_bootdisk.po.time_stamp
rm -f /home/dcleal/code/foreman/hammer_cli_foreman_bootdisk/lib/hammer_cli_foreman_bootdisk/../../locale/ru/hammer_cli_foreman_bootdisk.edit.po
cp /home/dcleal/code/foreman/hammer_cli_foreman_bootdisk/lib/hammer_cli_foreman_bootdisk/../../locale/ru/hammer_cli_foreman
require 'spec_helper'
PuppetLint.new_check(:case_spec) do
def check
resource_indexes.each do |resource|
notify :error,
message: 'No resources should be in the manifest',
line: resource[:tokens][0].line,
column: resource[:tokens][0].column,
token: resource[:tokens][0]
begin
require "bundler/inline"
rescue LoadError => e
$stderr.puts "Bundler version 1.10 or later is required. Please update your Bundler"
raise e
end
gemfile(true) do
source "https://rubygems.org"
gem "rails", github: "rails/rails"
begin
require "bundler/inline"
rescue LoadError => e
$stderr.puts "Bundler version 1.10 or later is required. Please update your Bundler"
raise e
end
gemfile(true) do
source "https://rubygems.org"
gem "rails", github: "rails/rails"