Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Consul DNS Package #1232

Merged
merged 5 commits into from
Mar 8, 2016
Merged

Consul DNS Package #1232

merged 5 commits into from
Mar 8, 2016

Conversation

BrianHicks
Copy link
Contributor

  • Installs cleanly on a fresh build of most recent master branch
  • Upgrades cleanly from the most recent release
  • Updates documentation relevant to the changes
  • Rebases cleanly onto the latest master

Fixes #1230

@ryane
Copy link
Contributor

ryane commented Mar 4, 2016

provisioned on top of 1.0.3 rc1 AWS cluster. installed cleanly, no problems so far

@BrianHicks
Copy link
Contributor Author

Looks like the build failed, but because Docker hub timed out on one cloud. The others worked fine. Should we consider that a green or retry it? @sehqlr

@sehqlr
Copy link
Contributor

sehqlr commented Mar 5, 2016

I would say retry it once.

@BrianHicks
Copy link
Contributor Author

Right, I'll rebase and then we can get this merged! 👍

@BrianHicks
Copy link
Contributor Author

As of right now, it would be a fast-forward merge. So we're good here.

path: /etc/NetworkManager/dnsmasq.d
state: directory
command: sed -i'' 's/consul *//g' /etc/resolv.conf.masq
register: resolve_without_consul
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this used for anything? (the resolve_without_consul variable)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just an old line I forgot to remove. Thanks for catching it!

@BrianHicks BrianHicks changed the title Feature/consul dns package Consul DNS Package Mar 7, 2016
@ryane ryane added this to the 1.0.4 milestone Mar 8, 2016
@ryane
Copy link
Contributor

ryane commented Mar 8, 2016

lgtm, successfully tested on aws. automated digitalocean build failed due to unrelated problem

ryane added a commit that referenced this pull request Mar 8, 2016
@ryane ryane merged commit 2a6b6a8 into master Mar 8, 2016
@langston-barrett langston-barrett deleted the feature/consul-dns-package branch March 8, 2016 21:47
@ryane ryane modified the milestones: 1.0.4, 1.1 Mar 17, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants