Skip to content

Commit

Permalink
modulesync: https, pmtignore, docker fqdns, linting, deb 9
Browse files Browse the repository at this point in the history
  • Loading branch information
ekohl authored and mmoll committed Nov 1, 2017
1 parent 639e1af commit 6735410
Show file tree
Hide file tree
Showing 10 changed files with 98 additions and 25 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ vendor/

## rspec
spec/fixtures/
junit/

## Puppet module
pkg/
Expand Down
51 changes: 51 additions & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# This file is managed centrally by modulesync
# https://github.com/theforeman/foreman-installer-modulesync

## MAC OS
.DS_Store

## TEXTMATE
*.tmproj
tmtags

## EMACS
*~
\#*
.\#*

## VIM
*.swp
*.swo
tags

## Bundler
Gemfile.lock
.bundle
vendor/

## rbenv / rvm
.rbenv*
.rvmrc*
.ruby-*

## rspec
spec/fixtures/
junit/

## Puppet module
pkg/
coverage/
.yardoc/

## InteliJ / RubyMine
.idea

## Beaker
.vagrant/
log/

# Files we don't want to ship in a release
CONTRIBUTING.md
Gemfile
Rakefile
spec/
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ Checklist (and a short version for the impatient)
description (50 characters is the soft limit, excluding ticket
number(s)), and should skip the full stop.

- If you have a [http://projects.theforeman.org/projects/puppet-foreman/issues](Redmine issue)
- If you have a [https://projects.theforeman.org/projects/puppet-foreman/issues](Redmine issue)
number, associate the issue in the message. The first line should start
with the issue number in the form "fixes #XXXX - rest of message".
[More information on the Redmine style](http://projects.theforeman.org/projects/foreman/wiki/Reviewing_patches-commit_message_format).
[More information on the Redmine style](https://projects.theforeman.org/projects/foreman/wiki/Reviewing_patches-commit_message_format).
Tickets are not required for our installer Puppet modules.

- If you have a GitHub issue number, associate the issue in the message.
Expand Down Expand Up @@ -108,9 +108,9 @@ The long version
is merged in.

GitHub has some pretty good
[general documentation](http://help.github.com/) on using
[general documentation](https://help.github.com/) on using
their site. They also have documentation on
[creating pull requests](http://help.github.com/send-pull-requests/).
[creating pull requests](https://help.github.com/send-pull-requests/).

In general, after pushing your topic branch up to your
repository on GitHub, you can switch to the branch in the
Expand All @@ -132,10 +132,10 @@ Getting Started
---------------

Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
package manager such as [bundler](http://bundler.io/) what Ruby packages,
package manager such as [bundler](https://bundler.io/) what Ruby packages,
or Gems, are required to build, develop, and test this software.

Please make sure you have [bundler installed](http://bundler.io/#getting-started)
Please make sure you have [bundler installed](https://bundler.io/#getting-started)
on your system, then use it to install all dependencies needed for this project,
by running

Expand Down Expand Up @@ -238,11 +238,11 @@ review.
Additional Resources
====================

* [Support and contact details](http://theforeman.org/support.html)
* [Support and contact details](https://theforeman.org/support.html)

* [General Foreman contribution details](http://theforeman.org/contribute.html)
* [General Foreman contribution details](https://theforeman.org/contribute.html)

* [General GitHub documentation](http://help.github.com/)
* [General GitHub documentation](https://help.github.com/)

* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
* [GitHub pull request documentation](https://help.github.com/send-pull-requests/)

21 changes: 11 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,22 @@ gem 'rspec-puppet', '~> 2.3'
gem 'rspec-puppet-facts', '>= 1.7'
gem 'puppetlabs_spec_helper', '>= 2.1.1'
gem 'puppet-lint', '>= 2'
gem 'puppet-lint-unquoted_string-check'
gem 'puppet-lint-empty_string-check'
gem 'puppet-lint-spaceship_operator_without_tag-check'
gem 'puppet-lint-variable_contains_upcase'
gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-undef_in_function-check'
gem 'puppet-lint-leading_zero-check'
gem 'puppet-lint-trailing_comma-check'
gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
gem 'puppet-lint-empty_string-check'
gem 'puppet-lint-file_ensure-check'
gem 'puppet-lint-leading_zero-check'
gem 'puppet-lint-param-docs', '>= 1.3.0'
gem 'puppet-lint-spaceship_operator_without_tag-check'
gem 'puppet-lint-strict_indent-check'
gem 'puppet-lint-trailing_comma-check'
gem 'puppet-lint-undef_in_function-check'
gem 'puppet-lint-unquoted_string-check'
gem 'puppet-lint-variable_contains_upcase'
gem 'puppet-lint-version_comparison-check'
gem 'simplecov'
gem 'puppet-blacksmith', '>= 3.1.0', {"groups"=>["development"]}
gem 'json', '~> 1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
gem 'json_pure', '~> 1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
gem 'logging', '~> 2.1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
gem 'beaker', '>= 3.9.0', {"groups"=>["system_tests"]}
gem 'beaker-rspec', {"groups"=>["system_tests"]}
gem 'beaker-module_install_helper', {"groups"=>["system_tests"]}
gem 'beaker-puppet_install_helper', {"groups"=>["system_tests"]}
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/docker/centos-6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# https://github.com/voxpupuli/modulesync
# https://github.com/theforeman/foreman-installer-modulesync
HOSTS:
centos-6-x64:
centos-6-x64.example.com:
platform: el-6-x86_64
hypervisor: docker
image: centos:6
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/docker/centos-7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# https://github.com/voxpupuli/modulesync
# https://github.com/theforeman/foreman-installer-modulesync
HOSTS:
centos-7-x64:
centos-7-x64.example.com:
platform: el-7-x86_64
hypervisor: docker
image: centos:7
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/docker/debian-8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# https://github.com/voxpupuli/modulesync
# https://github.com/theforeman/foreman-installer-modulesync
HOSTS:
debian-8-x64:
debian-8-x64.example.com:
platform: debian-8-amd64
hypervisor: docker
image: debian:8
Expand Down
20 changes: 20 additions & 0 deletions spec/acceptance/nodesets/docker/debian-9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/theforeman/foreman-installer-modulesync
HOSTS:
debian-9-x64.example.com:
platform: debian-9-amd64
hypervisor: docker
image: debian:9
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get update && apt-get install -y cron locales-all net-tools wget systemd-sysv'
- 'rm -f /usr/sbin/policy-rc.d'
- 'systemctl mask getty@tty1.service getty-static.service'
CONFIG:
trace_limit: 200
masterless: true
...
# vim: syntax=yaml
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/docker/ubuntu-14.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# https://github.com/voxpupuli/modulesync
# https://github.com/theforeman/foreman-installer-modulesync
HOSTS:
ubuntu-1404-x64:
ubuntu-1404-x64.example.com:
platform: ubuntu-14.04-amd64
hypervisor: docker
image: ubuntu:14.04
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/docker/ubuntu-16.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# https://github.com/voxpupuli/modulesync
# https://github.com/theforeman/foreman-installer-modulesync
HOSTS:
ubuntu-1604-x64:
ubuntu-1604-x64.example.com:
platform: ubuntu-16.04-amd64
hypervisor: docker
image: ubuntu:16.04
Expand Down

0 comments on commit 6735410

Please sign in to comment.