Skip to content
This repository was archived by the owner on Aug 29, 2018. It is now read-only.

Commit 0c4f786

Browse files
committed
Issue350 - Don't create quickstarts on OSE installs
This introduces quickstarts_json class parameter that if set will be deployed to /etc/openshift/quickstarts.json. If undef and ose_version is undef then the template in templates/broker/quickstarts.json.erb will be rendered. If undef and ose_version != undef then an empty quickstarts file will be deployed.
1 parent bead518 commit 0c4f786

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

README.asciidoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,14 @@ This parameter is only used when _ose_version_ is set.
931931

932932
Default: false
933933

934+
=== quickstarts_json
935+
JSON content to be deployed into /etc/openshift/quickstarts.json
936+
937+
Default: undef, which on Origin will deploy the contents
938+
of templates/broker/quickstarts.json.erb
939+
940+
OSE Default: undef and will not deploy any quickstarts
941+
934942
== Manual Tasks
935943

936944
This script attempts to automate as many tasks as it reasonably can.

manifests/broker.pp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,18 @@
184184
}
185185
}
186186

187+
if $::openshift_origin::quickstarts_json {
188+
$quickstart_content = $::openshift_origin::quickstarts_json
189+
} elsif $::openshift_origin::ose_version == undef {
190+
$quickstart_content = template('openshift_origin/broker/quickstarts.json.erb')
191+
} else {
192+
$quickstart_content = ''
193+
}
194+
187195
file { 'quickstarts':
188196
ensure => present,
189197
path => '/etc/openshift/quickstarts.json',
190-
content => template('openshift_origin/broker/quickstarts.json.erb'),
198+
content => $quickstart_content,
191199
owner => 'root',
192200
group => 'root',
193201
mode => '0644',

manifests/init.pp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,14 @@
720720
#
721721
# Default: undef
722722
#
723+
# [*quickstarts_json*]
724+
# JSON content to be deployed into /etc/openshift/quickstarts.json
725+
#
726+
# Default: undef, which on Origin will deploy the contents
727+
# of templates/broker/quickstarts.json.erb
728+
#
729+
# OSE Default: undef and will not deploy any quickstarts
730+
#
723731
# == Manual Tasks
724732
#
725733
# This script attempts to automate as many tasks as it reasonably can.

0 commit comments

Comments
 (0)