Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

expose ssl_listen to openstack::all and openstack::controller

  • Loading branch information...
commit 369b0d48a81e6e3632e59d508ef0c3b962f41ee1 1 parent d3f24f9
Dan Bode authored
3  manifests/all.pp
View
@@ -30,6 +30,7 @@
# [glance_db_password] The password for the db user for glance. Optional. Defaults to 'glance_pass'.
# [glance_user_password] The password of the glance service user. Optional. Defaults to 'glance_pass'.
# [secret_key] The secret key for horizon. Optional. Defaults to 'dummy_secret_key'.
+# [horizon_listen_ssl] If horizon should listen on ssl. Optional. Defaults to false.
# [verbose] If the services should log verbosely. Optional. Defaults to false.
# [purge_nova_config] Whether unmanaged nova.conf entries should be purged. Optional. Defaults to true.
# [libvirt_type] The virualization type being controlled by libvirt. Optional. Defaults to 'kvm'.
@@ -114,6 +115,7 @@
$cache_server_port = '11211',
$swift = false,
$horizon_app_links = undef,
+ $horizon_listen_ssl = false,
# if the cinder management components should be installed
$cinder = true,
$cinder_db_user = 'cinder',
@@ -379,6 +381,7 @@
swift => $swift,
quantum => $quantum,
horizon_app_links => $horizon_app_links,
+ listen_ssl => $horizon_listen_ssl,
}
}
3  manifests/controller.pp
View
@@ -34,6 +34,7 @@
# [verbose] Whether to log services at verbose.
# Horizon related config - assumes puppetlabs-horizon code
# [secret_key] secret key to encode cookies, …
+# [horizon_listen_ssl] If horizon should listen on ssl. Optional. Defaults to false.
# [cache_server_ip] local memcached instance ip
# [cache_server_port] local memcached instance port
# [horizon] (bool) is horizon installed. Defaults to: true
@@ -124,6 +125,7 @@
$cache_server_ip = '127.0.0.1',
$cache_server_port = '11211',
$horizon_app_links = undef,
+ $horizon_listen_ssl = false,
$swift = false,
# VNC
$vnc_enabled = true,
@@ -310,6 +312,7 @@
swift => $swift,
quantum => $quantum,
horizon_app_links => $horizon_app_links,
+ listen_ssl => $horizon_listen_ssl,
}
}
6 spec/classes/openstack_all_spec.rb
View
@@ -57,5 +57,11 @@
end
it { should_not contain_class('horizon') }
end
+ describe 'when ssl is enabled' do
+ let :params do
+ default_params.merge(:horizon_listen_ssl => true)
+ end
+ it { should contain_class('horizon').with_listen_ssl(true) }
+ end
end
end
7 spec/classes/openstack_controller_spec.rb
View
@@ -404,6 +404,13 @@
end
it { should_not contain_class('horizon') }
end
+
+ describe 'when ssl is enabled' do
+ let :params do
+ default_params.merge(:horizon_listen_ssl => true)
+ end
+ it { should contain_class('horizon').with_listen_ssl(true) }
+ end
end
context 'cinder' do
Please sign in to comment.
Something went wrong with that request. Please try again.