Skip to content

Commit 689735a

Browse files
authored
Merge pull request #172 from EncoreTechnologies/master
Major Update to Work With 2.3.1 (latest)
2 parents ca41317 + 9b8aa36 commit 689735a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1852
-1465
lines changed

.travis.yml

+37-6
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,47 @@ branches:
44
- gh-pages
55
sudo: false
66
language: ruby
7-
script: "script/cibuild"
7+
install: "script/ci_install.sh"
8+
script: "script/ci_build.sh"
89
bundler_args: --without rake
910
matrix:
1011
fast_finish: true
1112
include:
12-
- rvm: 1.9.3
13-
env: PUPPET_VERSION="~> 3.0"
13+
- rvm: 1.8.7
14+
env:
15+
- BUILD_NAME="RHEL 6"
16+
- PUPPET_VERSION="~> 3.0"
17+
- GEMFILE_LOCK="Gemfile.lock.3.8.7.ruby1.8.7"
1418
- rvm: 2.0.0
15-
env: PUPPET_VERSION="~> 3.0"
16-
- rvm: 2.1.0
17-
env: PUPPET_VERSION="~> 3.0"
19+
env:
20+
- BUILD_NAME="RHEL 7"
21+
- PUPPET_VERSION="~> 3.0"
22+
- GEMFILE_LOCK="Gemfile.lock.3.8.7.ruby2.0.0"
23+
- rvm: 1.9.3
24+
env:
25+
- BUILD_NAME="Ubuntu 14"
26+
- PUPPET_VERSION="~> 3.0"
27+
- GEMFILE_LOCK="Gemfile.lock.3.8.7.ruby1.9.3"
28+
# Can't run our unittests against default puppet version on Ubuntu 16
29+
# because it ships with a brand new version of Ruby (2.3.x) and an old
30+
# version of puppet (3.8.5) that is not compatible with new versions
31+
# of Ruby that are needed for the unit tests. This is only a unit testing
32+
# deficiency, the runtime component of 3.8.5 works just fine with ruby 2.3
33+
# for using this module.
34+
- rvm: 2.3.1
35+
env:
36+
- BUILD_NAME="Ubuntu 16"
37+
- PUPPET_VERSION="~> 4.0"
38+
- GEMFILE_LOCK="Gemfile.lock.4.10.5.ruby2.3.1"
39+
- rvm: 2.1.10
40+
env:
41+
- BUILD_NAME="Puppet 4 (generic)"
42+
- PUPPET_VERSION="~> 4.0"
43+
- GEMFILE_LOCK="Gemfile.lock.4.10"
44+
- rvm: 2.4.1
45+
env:
46+
- BUILD_NAME="Puppet 5 (generic)"
47+
- PUPPET_VERSION="~> 5.0"
48+
- GEMFILE_LOCK="Gemfile.lock.5.0"
1849
notifications:
1950
email: false

CHANGELOG.md

+153
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,158 @@
11
# Changelog
22

3+
## 1.0.0-beta (Aug 14, 2017)
4+
5+
#### files/repo/nodesource/NODESOURCE-GPG-SIGNING-KEY-EL
6+
7+
- Removed unused file after cleaning up nodejs profiel (Enhancement)
8+
9+
#### manifests/auth/standalone.pp
10+
11+
- Did not have access to the `::st2` variables (Bugfix).
12+
- Had a dependency issue where (on some platforms) allowed the `htpasswd` file to be created after the st2 services were starting (Bugfix)
13+
- Created an unnecessary "test user" (Bugfix)
14+
15+
#### manifests/auth_user.pp
16+
17+
- Dependency issues here where the `htpasswd` file was sometimes trying to be created before the `/etc/st2` directory was created, and other times it was trying to be created after the st2 services had started. (Bugfix)
18+
19+
#### manifests/init.pp
20+
21+
- Needed extra variables for SSL setup in st2web. (Feature)
22+
- Needed extra variables for proper database setup (mongodb and postgres) (Enhancement)
23+
- Needed path to the st2auth logging config file (Enhancement)
24+
- Needed variables about the datastore encryption keys (Feature)
25+
26+
#### manifests/kv.pp
27+
28+
- Some puppet lint problems (notice the whitespace fix and reordering of class params) (Bugfix)
29+
- Dependency issues where the tag being used for the `Service` resource was incorrect (Bugfix)
30+
- Dependency issues where sometimes st2 hadn't been reloaded so the k/v loads would fail (Bugfix)
31+
32+
#### manifests/notices.pp
33+
34+
- Puppet lint fixes for using double quotes without variable interpolation in the string. (Bugfix)
35+
36+
#### manifests/pack.pp
37+
38+
- Unit tests revealed that many of the dependencies of this resource were not declared (group and directories) (Bugfix)
39+
- Pointing at old location for config directory (Bugfix)
40+
- Needed lots of dependency work to ensure resources were created in the proper order (Bugfix)
41+
42+
#### manifests/params.pp
43+
44+
- Broke down the old `st2_server_packages` variable into various components to align more with what ansible-st2 and the "one liner" shell scripts do in their functions. (Enhancement)
45+
- Removed some unused code in the "init provider" section (Enhancement)
46+
- Broke down the old `st2_services` into its components similar to `st2_server_packages`. FYI: The mistral services are handled by the mistral install instead of being grouped together into `st2 server`. (Enhancement)
47+
- Added lots of new parameters for services that were not configured in the past like (nginx, st2web, mongodb, rabbitmq) (Feature)
48+
49+
#### manifests/profile/client.pp
50+
51+
- Removed stale comment (Enhancement)
52+
53+
#### manifests/profile/fullinstall.pp
54+
55+
- Mainly dependency cleanup here. (Bugfix)
56+
- Ensure that packages are installed in the correct order and that there are meaningful anchors in place in case others need to execute tasks at certain points during the install. (Bugfix)
57+
58+
#### manifests/profile/mistral.pp
59+
60+
- This was completely re-written (Enhancement)
61+
- Previously it was performing a lot of tasks manually that i believe st2mistral package now handles for us (Enhancement)
62+
63+
#### manifests/profile/mongodb.pp
64+
65+
- Completely re-written (Enhancement)
66+
- It now handles auth (did not previously) (Enhancement)
67+
- It also deals with several deficiencies in the puppetlabs-mongodb module. This module has lots of annoying bugs. I'm not at the point where i want to code up a new module myself yet, but we do have to work around several quirks for this to even work (sorry!). (Bugfix)
68+
69+
#### manifests/profile/nginx.pp
70+
71+
- New profile that installs and configures nginx (does not setup st2web config, that is left to the st2web profile) (Feature)
72+
- Utilizes the nginx puppet module to do all of the heavy lifting here (Feature)
73+
74+
#### manifests/profile/nodejs.pp
75+
76+
- Completely re-written (Enhancement)
77+
- Utilizes the nodejs puppet module to do all of the heavy lifting instead of doing it ourselves (Enhancement)
78+
- Works around a small quirk of the module on RedHat distributions (BugFix)
79+
80+
#### manifests/profile/postgresql.pp
81+
82+
- Expanded this to properly configure postgres for listening according to the standard installs (shell scripts and ansible-st2) (Enhancement)
83+
- Also ensured that 9.4 is installed on RHEL6 (Bugfix)
84+
85+
#### manifests/profile/rabbitmq.pp
86+
87+
- Greatly simplified by allowing the rabbitmq module to do all of the heavy lifting for us (Enhancement)
88+
89+
#### manifests/profile/repos.pp
90+
91+
- Fixed a bug where we were pointing to an all lowercase URL which caused st2 package installs to fail (Bugfix)
92+
93+
#### manifests/profile/selinux.pp
94+
95+
- Added a class that configures SELinux on RHEL hosts (Feature)
96+
97+
#### manifests/profile/server.pp
98+
99+
- Small changes here related to adding database auth capability (Enhancement)
100+
- Added stanley user creation (Feature)
101+
- Added datastore crypto creation (Feature)
102+
- Added additional dependency management (Bugfix)
103+
104+
#### manifests/profile/web.pp
105+
106+
- Completely re-written (Enhancement)
107+
- I don't believe that st2web was complete when this module was last touched, so this class got a complete overhaul (Enhancement)
108+
109+
#### manifests/rbac.pp
110+
111+
- Fixed a few puppet lint errors (Bugfix)
112+
- Fixed an error where the RBAC rules were executed every puppet run (Bugfix)
113+
114+
#### manifests/server/datastore_keys.pp
115+
116+
- New manifest that manages the datastore crypto keys (Feature)
117+
118+
#### manifests/stanley.pp
119+
120+
- Removed unnecessary warning about ssh keys (Bugfix)
121+
122+
#### manifests/user.pp
123+
124+
- Fixed a couple small bugs related to a legacy "robots" group. (Bugfix)
125+
- This got a pretty big overhaul with regards to SSH key creation. Now, if SSH keys are not present new ones will be created (just like the shell scripts and ansible-st2) (Bugfix)
126+
127+
#### metadata.json
128+
129+
- Reformatted the whole file to standard JSON formatting scheme (Enhancement)
130+
- Updated module dependencies (some were missing) (Bugfix)
131+
- Added supported OS block (Enhancement)
132+
- Added supported puppet versions block (Enhancement)
133+
134+
#### spec/*
135+
136+
- Lots of small fixes here related to running the tests on various versions of ruby. (Bugfix)
137+
- Finally found a happy medium where all tests now pass (Bugfix)
138+
- Removed tests for the "st2::package::debian" type that no longer exists (Bugfix)
139+
140+
#### templates/*
141+
142+
- Removed the following unused templates due to code cleanup and modernizaiton (Enhancement)
143+
- templates/etc/init.d/mistral-api.erb
144+
- templates/etc/init.d/mistral.erb
145+
- templates/etc/init/mistral-api.conf.erb
146+
- templates/etc/init/mistral.conf.erb
147+
- templates/etc/init/st2actionrunner-worker.conf.erb
148+
- templates/etc/systemd/system/mistral-api.service.erb
149+
- templates/etc/systemd/system/mistral.service.erb
150+
- templates/etc/systemd/system/st2actionrunner.service.erb
151+
- templates/etc/systemd/system/st2service_multi.service.erb
152+
- templates/etc/systemd/system/st2service_single.service.erb
153+
- templates/opt/st2web/config.js.erb
154+
155+
3156
## 0.14.1 (Jan 15, 2015)
4157
* Fix typo - st2garbagecollector is part of st2reactor package.
5158

Gemfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
source 'https://rubygems.org'
22

3-
if puppetversion = ENV['PUPPET_VERSION']
3+
puppetversion = ENV['PUPPET_VERSION']
4+
5+
if puppetversion
46
gem 'puppet', puppetversion, :require => false
57
else
68
gem 'puppet', :require => false
@@ -10,9 +12,9 @@ gem 'puppetlabs_spec_helper', '>= 0.1.0'
1012
gem 'puppet-lint', '>= 0.3.2'
1113
gem 'facter', '>= 1.7.0'
1214

13-
gem 'coveralls', require: false
15+
gem 'coveralls', :require => false
1416

15-
gem 'puppet-blacksmith', '>= 3.3.1'
17+
gem 'puppet-blacksmith', '>= 3.1.1'
1618

1719
### ADD USER GEMS HERE ###
1820

Gemfile.lock

-86
This file was deleted.

Gemfile.lock.3.8.7.ruby1.8.7

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
coveralls (0.8.21)
5+
json (>= 1.8, < 3)
6+
simplecov (~> 0.14.1)
7+
term-ansicolor (~> 1.3)
8+
thor (~> 0.19.4)
9+
tins (~> 1.6)
10+
diff-lcs (1.3)
11+
docile (1.1.5)
12+
facter (2.5.0)
13+
hiera (1.3.4)
14+
json_pure
15+
json (1.8.6)
16+
json_pure (1.8.3)
17+
metaclass (0.0.4)
18+
mime-types (1.25.1)
19+
mocha (1.2.1)
20+
metaclass (~> 0.0.1)
21+
puppet (3.8.7)
22+
facter (> 1.6, < 3)
23+
hiera (~> 1.0)
24+
json_pure
25+
puppet-blacksmith (3.1.1)
26+
puppet (>= 2.7.16)
27+
rest-client
28+
puppet-lint (2.3.0)
29+
puppet-syntax (2.4.1)
30+
rake
31+
puppetlabs_spec_helper (1.2.2)
32+
mocha (~> 1.0)
33+
puppet-lint (~> 2.0)
34+
puppet-syntax (~> 2.0)
35+
rspec-puppet (~> 2.0)
36+
rake (10.5.0)
37+
rest-client (1.6.9)
38+
mime-types (~> 1.16)
39+
rspec (3.1.0)
40+
rspec-core (~> 3.1.0)
41+
rspec-expectations (~> 3.1.0)
42+
rspec-mocks (~> 3.1.0)
43+
rspec-core (3.1.0)
44+
rspec-support (~> 3.1.0)
45+
rspec-expectations (3.1.0)
46+
diff-lcs (>= 1.2.0, < 2.0)
47+
rspec-support (~> 3.1.0)
48+
rspec-mocks (3.1.0)
49+
diff-lcs (>= 1.2.0, < 2.0)
50+
rspec-support (~> 3.1.0)
51+
rspec-puppet (2.6.4)
52+
rspec
53+
rspec-support (3.1.0)
54+
simplecov (0.14.1)
55+
docile (~> 1.1.0)
56+
json (>= 1.8, < 3)
57+
simplecov-html (~> 0.10.0)
58+
simplecov-html (0.10.1)
59+
term-ansicolor (1.3.2)
60+
tins (~> 1.0)
61+
thor (0.19.4)
62+
tins (1.6.0)
63+
64+
PLATFORMS
65+
ruby
66+
67+
DEPENDENCIES
68+
coveralls
69+
facter (>= 1.7.0)
70+
puppet (= 3.8.7)
71+
puppet-blacksmith (>= 3.3.1)
72+
puppet-lint (>= 0.3.2)
73+
puppetlabs_spec_helper (>= 0.1.0)
74+
75+
BUNDLED WITH
76+
1.15.3

0 commit comments

Comments
 (0)