search

openshift / puppet-openshift_origin

Puppet module to create OpenShift Brokers and Nodes. Can be used to create a full OpenShift Origin deployment.
http://forge.puppetlabs.com/openshift/openshift_origin
Other
45 stars 128 forks source link

Fix cert issue #324

Closed detiber closed 10 years ago

detiber commented 10 years ago

Generate self-signed certificates if needed for broker and node.

detiber commented 10 years ago

[test]

openshift-bot commented 10 years ago

Origin Test Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests/3057/)

detiber commented 10 years ago

The test failure is a bit perplexing, wondering if it is because of the version of puppet used by the vagrant plugin (2.7 from epel)

Installing -- do not interrupt ...

/etc/puppet/modules
└─┬ openshift-openshift_origin (v4.0.11)
  ├─┬ arioch-keepalived (v1.0.1)
  │ └── puppetlabs-concat (v1.1.2)
  ├── blentz-selinux_types (v0.1.0)
  ├── duritong-sysctl (v0.0.5)
  ├── puppetlabs-haproxy (v1.0.0)
  ├── puppetlabs-ntp (v3.2.1)
  ├── puppetlabs-stdlib (v4.3.2)
  └── rharrison-lokkit (v0.5.0)
Applying openshift puppet recipe

info: Loading facts in /etc/puppet/modules/concat/lib/facter/concat_basedir.rb
info: Loading facts in /etc/puppet/modules/stdlib/lib/facter/pe_version.rb
info: Loading facts in /etc/puppet/modules/stdlib/lib/facter/puppet_vardir.rb
info: Loading facts in /etc/puppet/modules/stdlib/lib/facter/root_home.rb
info: Loading facts in /etc/puppet/modules/stdlib/lib/facter/facter_dot_d.rb

Syntax error at '{'; expected '}' at /etc/puppet/modules/openshift_origin/manifests/broker.pp:237 on node openshift.ec2.internal
sdodson commented 10 years ago

@detiber Looks like 'unless' was added in Puppet 3.0.

https://docs.puppetlabs.com/puppet/3/reference/release_notes.html#unless-statement

The docs for our module mention that we require Puppet 3.0 or later so I'm going to work on testing that other issue I'm seeing after upgrading to 3.0. If that resolves that I'll look at updating our vagrant toolchain to ensure puppet 3.0 or later is used.

detiber commented 10 years ago

@ekohl still need to run this through testing, but went through and refactored the httpd certificate generation into it's own class.

ekohl commented 10 years ago

Untested, but :+1: on the general solution.

openshift-bot commented 10 years ago

Evaluated for origin up to 3f3e6bef4a823d2060fea249466d3ed3159582ee