Skip to content

Commit 4019820

Browse files
ekohlmmoll
authored andcommitted
modulesync: https, pmtignore, docker fqdns, linting, deb 9
1 parent bc42496 commit 4019820

10 files changed

+98
-25
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ vendor/
3030

3131
## rspec
3232
spec/fixtures/
33+
junit/
3334

3435
## Puppet module
3536
pkg/

.pmtignore

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# This file is managed centrally by modulesync
2+
# https://github.com/theforeman/foreman-installer-modulesync
3+
4+
## MAC OS
5+
.DS_Store
6+
7+
## TEXTMATE
8+
*.tmproj
9+
tmtags
10+
11+
## EMACS
12+
*~
13+
\#*
14+
.\#*
15+
16+
## VIM
17+
*.swp
18+
*.swo
19+
tags
20+
21+
## Bundler
22+
Gemfile.lock
23+
.bundle
24+
vendor/
25+
26+
## rbenv / rvm
27+
.rbenv*
28+
.rvmrc*
29+
.ruby-*
30+
31+
## rspec
32+
spec/fixtures/
33+
junit/
34+
35+
## Puppet module
36+
pkg/
37+
coverage/
38+
.yardoc/
39+
40+
## InteliJ / RubyMine
41+
.idea
42+
43+
## Beaker
44+
.vagrant/
45+
log/
46+
47+
# Files we don't want to ship in a release
48+
CONTRIBUTING.md
49+
Gemfile
50+
Rakefile
51+
spec/

CONTRIBUTING.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Checklist (and a short version for the impatient)
1717
description (50 characters is the soft limit, excluding ticket
1818
number(s)), and should skip the full stop.
1919

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

2626
- If you have a GitHub issue number, associate the issue in the message.
@@ -108,9 +108,9 @@ The long version
108108
is merged in.
109109

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

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

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

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

@@ -238,11 +238,11 @@ review.
238238
Additional Resources
239239
====================
240240

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

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

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

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

Gemfile

+11-10
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@ gem 'rspec-puppet', '~> 2.3'
1111
gem 'rspec-puppet-facts', '>= 1.7'
1212
gem 'puppetlabs_spec_helper', '>= 2.1.1'
1313
gem 'puppet-lint', '>= 2'
14-
gem 'puppet-lint-unquoted_string-check'
15-
gem 'puppet-lint-empty_string-check'
16-
gem 'puppet-lint-spaceship_operator_without_tag-check'
17-
gem 'puppet-lint-variable_contains_upcase'
1814
gem 'puppet-lint-absolute_classname-check'
19-
gem 'puppet-lint-undef_in_function-check'
20-
gem 'puppet-lint-leading_zero-check'
21-
gem 'puppet-lint-trailing_comma-check'
15+
gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
16+
gem 'puppet-lint-empty_string-check'
2217
gem 'puppet-lint-file_ensure-check'
18+
gem 'puppet-lint-leading_zero-check'
2319
gem 'puppet-lint-param-docs', '>= 1.3.0'
20+
gem 'puppet-lint-spaceship_operator_without_tag-check'
21+
gem 'puppet-lint-strict_indent-check'
22+
gem 'puppet-lint-trailing_comma-check'
23+
gem 'puppet-lint-undef_in_function-check'
24+
gem 'puppet-lint-unquoted_string-check'
25+
gem 'puppet-lint-variable_contains_upcase'
26+
gem 'puppet-lint-version_comparison-check'
2427
gem 'simplecov'
2528
gem 'puppet-blacksmith', '>= 3.1.0', {"groups"=>["development"]}
26-
gem 'json', '~> 1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
27-
gem 'json_pure', '~> 1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
28-
gem 'logging', '~> 2.1.0', {"platforms"=>["ruby_19"], "groups"=>["test"]}
29+
gem 'beaker', '>= 3.9.0', {"groups"=>["system_tests"]}
2930
gem 'beaker-rspec', {"groups"=>["system_tests"]}
3031
gem 'beaker-module_install_helper', {"groups"=>["system_tests"]}
3132
gem 'beaker-puppet_install_helper', {"groups"=>["system_tests"]}

spec/acceptance/nodesets/docker/centos-6.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# https://github.com/voxpupuli/modulesync
44
# https://github.com/theforeman/foreman-installer-modulesync
55
HOSTS:
6-
centos-6-x64:
6+
centos-6-x64.example.com:
77
platform: el-6-x86_64
88
hypervisor: docker
99
image: centos:6

spec/acceptance/nodesets/docker/centos-7.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# https://github.com/voxpupuli/modulesync
44
# https://github.com/theforeman/foreman-installer-modulesync
55
HOSTS:
6-
centos-7-x64:
6+
centos-7-x64.example.com:
77
platform: el-7-x86_64
88
hypervisor: docker
99
image: centos:7

spec/acceptance/nodesets/docker/debian-8.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# https://github.com/voxpupuli/modulesync
44
# https://github.com/theforeman/foreman-installer-modulesync
55
HOSTS:
6-
debian-8-x64:
6+
debian-8-x64.example.com:
77
platform: debian-8-amd64
88
hypervisor: docker
99
image: debian:8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
# This file is managed via modulesync
3+
# https://github.com/voxpupuli/modulesync
4+
# https://github.com/theforeman/foreman-installer-modulesync
5+
HOSTS:
6+
debian-9-x64.example.com:
7+
platform: debian-9-amd64
8+
hypervisor: docker
9+
image: debian:9
10+
docker_preserve_image: true
11+
docker_cmd: '["/sbin/init"]'
12+
docker_image_commands:
13+
- 'apt-get update && apt-get install -y cron locales-all net-tools wget systemd-sysv'
14+
- 'rm -f /usr/sbin/policy-rc.d'
15+
- 'systemctl mask [email protected] getty-static.service'
16+
CONFIG:
17+
trace_limit: 200
18+
masterless: true
19+
...
20+
# vim: syntax=yaml

spec/acceptance/nodesets/docker/ubuntu-14.04.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# https://github.com/voxpupuli/modulesync
44
# https://github.com/theforeman/foreman-installer-modulesync
55
HOSTS:
6-
ubuntu-1404-x64:
6+
ubuntu-1404-x64.example.com:
77
platform: ubuntu-14.04-amd64
88
hypervisor: docker
99
image: ubuntu:14.04

spec/acceptance/nodesets/docker/ubuntu-16.04.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# https://github.com/voxpupuli/modulesync
44
# https://github.com/theforeman/foreman-installer-modulesync
55
HOSTS:
6-
ubuntu-1604-x64:
6+
ubuntu-1604-x64.example.com:
77
platform: ubuntu-16.04-amd64
88
hypervisor: docker
99
image: ubuntu:16.04

0 commit comments

Comments
 (0)