Skip to content

Commit 030aec5

Browse files
committed
Fix variables and update tasks
- Fix log portion of start line in init script - fixes #13 - Fix bad nomad_docker_enable variable refs - Update CONTRIBUTING
1 parent 1a46abd commit 030aec5

File tree

5 files changed

+41
-35
lines changed

5 files changed

+41
-35
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@
208208

209209
- Remove bootstrap task
210210

211-
## v1.6.4 (UNRELEASED)
211+
## v1.6.4
212212

213213
- Fix log portion of start line in init script - fixes #13
214+
- Fix bad nomad_docker_enable variable refs
215+
- Update CONTRIBUTING

CONTRIBUTING.md

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,51 @@
11
# Contributing
22

3-
When contributing to this repository, please first discuss the change you wish to make via issue,
4-
email, or any other method with the owners of this repository before making a change.
3+
When contributing to this repository, please first discuss the change you wish
4+
to make via issue, email, or any other method with the owners of this repository before making a change.
55

6-
Please note we have a code of conduct, please follow it in all your interactions with the project.
6+
Do note that this project has a code of conduct; please be sure to follow it
7+
in all of your project interactions.
78

89
## Pull Request Process
910

10-
1. Ensure any install or build dependencies are removed before the end of the layer when doing a
11-
build.
12-
2. Update the README.md with details of changes to the interface, this includes new environment
13-
variables, exposed ports, useful file locations and container parameters.
14-
3. Increase the version numbers in any examples files and the README.md to the new version that this
15-
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
16-
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
17-
do not have permission to do that, you may request the second reviewer to merge it for you.
11+
1. Ensure any install or build artifacts are removed before the end of
12+
the layer when doing a build
13+
2. Update the README.md or README_VAGRANT.md with details of changes to the
14+
interface, this includes new environment variables, exposed ports, useful
15+
file locations and container parameters
16+
3. Increase the version numbers in any examples files and the README.md
17+
to the new version that this Pull Request would represent. The versioning scheme we use is (mostly) [SemVer](http://semver.org/)
18+
4. You may merge the Pull Request in once you have the sign-off of two other
19+
project contributors, or if you do not have permission to do that, you can
20+
request the second reviewer to merge it for you
1821

1922
## Code of Conduct
2023

2124
### Our Pledge
2225

2326
In the interest of fostering an open and welcoming environment, we as
24-
contributors and maintainers pledge to making participation in our project and
25-
our community a harassment-free experience for everyone, regardless of age, body
26-
size, disability, ethnicity, gender identity and expression, level of experience,
27-
nationality, personal appearance, race, religion, or sexual identity and
28-
orientation.
27+
contributors and maintainers pledge to making participation in our project
28+
and our community a harassment-free experience for everyone, regardless of age,
29+
body size, disability, ethnicity, gender identity and expression, level of
30+
experience, nationality, personal appearance, race, religion, or sexual
31+
identity and orientation.
2932

3033
### Our Standards
3134

3235
Examples of behavior that contributes to creating a positive environment
3336
include:
3437

38+
* Showing empathy towards other community members
3539
* Using welcoming and inclusive language
3640
* Being respectful of differing viewpoints and experiences
3741
* Gracefully accepting constructive criticism
3842
* Focusing on what is best for the community
39-
* Showing empathy towards other community members
4043

4144
Examples of unacceptable behavior by participants include:
4245

43-
* The use of sexualized language or imagery and unwelcome sexual attention or
44-
advances
45-
* Trolling, insulting/derogatory comments, and personal or political attacks
46+
* Use of sexualized language or imagery and unwelcome sexual attention
47+
or advances
48+
* Insulting/derogatory comments, and personal or political attacks
4649
* Public or private harassment
4750
* Publishing others' private information, such as a physical or electronic
4851
address, without explicit permission
@@ -66,27 +69,28 @@ threatening, offensive, or harmful.
6669
This Code of Conduct applies both within project spaces and in public spaces
6770
when an individual is representing the project or its community. Examples of
6871
representing a project or community include using an official project e-mail
69-
address, posting via an official social media account, or acting as an appointed
70-
representative at an online or offline event. Representation of a project may be
71-
further defined and clarified by project maintainers.
72+
address, posting via an official social media account, or acting as an
73+
appointed representative at an online or offline event. Representation of a
74+
project may be further defined and clarified by project maintainers.
7275

7376
### Enforcement
7477

7578
Instances of abusive, harassing, or otherwise unacceptable behavior may be
76-
reported by contacting the project leadership: brian [at] brianshumate [dot] com. All
77-
complaints will be reviewed and investigated and will result in a response that
78-
is deemed necessary and appropriate to the circumstances. The project team is
79-
obligated to maintain confidentiality with regard to the reporter of an incident.
80-
Further details of specific enforcement policies may be posted separately.
79+
reported by contacting the project leadership: brian <at> brianshumate <dot> com.
80+
81+
All complaints will be reviewed and investigated and will result in a response
82+
that is deemed necessary and appropriate to the circumstances. The project
83+
team is obligated to maintain confidentiality with regard to the reporter of
84+
an incident. Further details of specific enforcement policies may be posted
85+
separately.
8186

8287
Project maintainers who do not follow or enforce the Code of Conduct in good
8388
faith may face temporary or permanent repercussions as determined by other
8489
members of the project's leadership.
8590

8691
### Attribution
8792

88-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
89-
available at [http://contributor-covenant.org/version/1/4][version]
93+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
9094

9195
[homepage]: http://contributor-covenant.org
92-
[version]: http://contributor-covenant.org/version/1/4/
96+
[version]: http://contributor-covenant.org/version/1/4/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The role defines all variables in `defaults/main.yml`:
4444
| `nomad_iface` | `eth1` | nomad network interface |
4545
| `nomad_advertise_address` | dynamic from hosts inventory | The interface address to advertise to other nodes |
4646
| `nomad_bind_address` | "0.0.0.0" | Default bind address |
47-
| `nomad_enable_docker` | `false` | Install Docker subsystem on nodes? |
47+
| `nomad_docker_enable` | `false` | Install Docker subsystem on nodes? |
4848
| 'nomad_use_consul' | `False` | bootstrap nomad via native consul zero-conf suppport.. assumes consul default ports etc|
4949

5050
### OS Distribution Variables

tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
name: nomad
4141
groups: docker
4242
append: yes
43-
when: nomad_enable_docker == "true"
43+
when: nomad_docker_enable == "true"
4444

4545
- name: Include OS variables
4646
include_vars: "{{ ansible_os_family }}.yml"

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.6.3
1+
v1.6.4

0 commit comments

Comments
 (0)