Skip to content

More rpc port support for debian/upstart#177

Merged
solarkennedy merged 3 commits intomasterfrom
more_rpc_port
Aug 23, 2015
Merged

More rpc port support for debian/upstart#177
solarkennedy merged 3 commits intomasterfrom
more_rpc_port

Conversation

@solarkennedy
Copy link
Contributor

Related to #173

I wish we didn't have so many init scripts to maintain :(

@aj-jester
Copy link

I tested it on Ubuntu and it works 👍

One trivial suggestion I would make is adding a test when the rpc_addr == client_addr because of this https://github.com/solarkennedy/puppet-consul/blob/master/manifests/init.pp#L133

So something like:

context "When rpc_addr defaults to client_addr on sysv" do
    let (:params) {{
      :init_style => 'sysv',
      :config_hash => {
        'client_addr' => '192.168.34.56',
      }
    }}
    it { should contain_class('consul').with_init_style('sysv') }
    it {
      should contain_file('/etc/init.d/consul').
        with_content(/-rpc-addr=192.168.34.56:8400/)
    }
  end

🚄 LGTM

@aj-jester
Copy link

@solarkennedy Sorry this is my fault, I should've asked for this test to be added in the other PR as well, I didn't think about it then, so yah no big deal if we don't want to add.

@solarkennedy
Copy link
Contributor Author

Added! Thanks.

solarkennedy added a commit that referenced this pull request Aug 23, 2015
More rpc port support for debian/upstart
@solarkennedy solarkennedy merged commit 3128b47 into master Aug 23, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants