diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 12 | ||||
| -rw-r--r-- | puppet/services/gnocchi-base.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/keystone.yaml | 2 |
4 files changed, 9 insertions, 13 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 8de9a19c..d4fdea3d 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -485,7 +485,7 @@ resources: upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute} ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} ceilometer_password: {get_param: CeilometerPassword} - ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]} + ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]} neutron_password: {get_param: NeutronPassword} diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 7d332a2b..3a6370e4 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -240,14 +240,10 @@ if hiera('step') >= 5 { Pacemaker::Resource::Service[$::aodh::params::listener_service_name]], } - # Horizon and Keystone - pacemaker::resource::service { $::apache::params::service_name: - clone_params => 'interleave=true', - verify_on_create => true, - require => [File['/etc/keystone/ssl/certs/ca.pem'], - File['/etc/keystone/ssl/private/signing_key.pem'], - File['/etc/keystone/ssl/certs/signing_cert.pem']], - } + # The next step is to include this class in puppet-tripleo profiles directly. + # We couldn't do it directly in puppet-tripleo, otherwise CI would have break because + # of Puppet duplicated resource. + include ::tripleo::profile::pacemaker::apache #VSM if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml index 44f3c3c7..e49c440b 100644 --- a/puppet/services/gnocchi-base.yaml +++ b/puppet/services/gnocchi-base.yaml @@ -72,10 +72,10 @@ outputs: gnocchi::storage::ceph::ceph_keyring: list_join: - '.' - - - '/etc/ceph/ceph/' - - 'client/' + - - '/etc/ceph/ceph' + - 'client' - {get_param: CephClientUserName} - - '/keyring' + - 'keyring' #Gnocchi statsd gnocchi::statsd::manage_service: false gnocchi::statsd::resource_id: '0a8b55df-f90f-491c-8cb9-7cdecec6fc26' diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index e98be118..404ce6cd 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -87,7 +87,7 @@ parameters: KeystoneWorkers: type: string description: Set the number of workers for keystone::wsgi::apache - default: '$::processorcount' + default: '"%{::processorcount}"' outputs: role_data: description: Role data for the Keystone role. |