diff options
| author |   Carlos Camacho <ccamacho@redhat.com> | 2016-06-29 15:25:23 +0200 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-07-11 17:18:07 -0400 |
| commit | c4f27255c50a8afc737346db549b701515494f79 (patch) | |
| tree | b94b56ad3ace36b7c68b2dbc686b3fbb866ec50c /puppet/manifests | |
| parent | 81ee3b79d01f065528b0e17675aba311863c25b2 (diff) | |
Composable Horizon service - tripleo-heat-templates
Add horizon as a composable service
Depends-on: Iff6508972edfd5f330b239719bc5eb14d3f71944
Change-Id: I734c3e0784c25f30adff2e13faf1155a3e45cefd
Partially-implements: blueprint composable-services-within-roles
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 21 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 27 |
2 files changed, 0 insertions, 48 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 4f15bb72..9cdbda0f 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -77,27 +77,6 @@ if hiera('step') >= 4 { include ::aodh::listener include ::aodh::client - # Horizon - include ::apache::mod::remoteip - if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { - $_profile_support = 'cisco' - } else { - $_profile_support = 'None' - } - $neutron_options = merge({'profile_support' => $_profile_support },hiera('horizon::neutron_options',undef)) - - $memcached_ipv6 = hiera('memcached_ipv6', false) - if $memcached_ipv6 { - $horizon_memcached_servers = hiera('memcache_node_ips_v6', '[::1]') - } else { - $horizon_memcached_servers = hiera('memcache_node_ips', '127.0.0.1') - } - - class { '::horizon': - cache_server_ip => $horizon_memcached_servers, - neutron_options => $neutron_options, - } - # Gnocchi $gnocchi_database_connection = hiera('gnocchi_mysql_conn_string') class { '::gnocchi': diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 9a9d0081..cfa693be 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -269,33 +269,6 @@ MYSQL_HOST=localhost\n", include ::nova::config - # httpd/apache and horizon - # NOTE(gfidente): server-status can be consumed by the pacemaker resource agent - class { '::apache' : - service_enable => false, - # service_manage => false, # <-- not supported with horizon&apache mod_wsgi? - } - include ::apache::mod::remoteip - include ::apache::mod::status - if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { - $_profile_support = 'cisco' - } else { - $_profile_support = 'None' - } - $neutron_options = merge({'profile_support' => $_profile_support },hiera('horizon::neutron_options',undef)) - - $memcached_ipv6 = hiera('memcached_ipv6', false) - if $memcached_ipv6 { - $horizon_memcached_servers = hiera('memcache_node_ips_v6', '[::1]') - } else { - $horizon_memcached_servers = hiera('memcache_node_ips', '127.0.0.1') - } - - class { '::horizon': - cache_server_ip => $horizon_memcached_servers, - neutron_options => $neutron_options, - } - # Aodh class { '::aodh' : database_connection => hiera('aodh_mysql_conn_string'), |