aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/nova/api.pp24
1 files changed, 10 insertions, 14 deletions
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 03706dc..ca2f7dd 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -39,23 +39,19 @@ class tripleo::profile::base::nova::api (
if $step >= 4 or ($step >= 3 and $sync_db) {
- # Manages the migration to Nova API in mod_wsgi with Apache.
- # - First update nova.conf with new parameters
- # - Stop nova-api process before starting apache to avoid binding error
- # - Start apache after configuring all vhosts
- exec { 'stop_nova-api':
- command => 'service openstack-nova-api stop',
- path => ['/usr/bin', '/usr/sbin'],
- onlyif => 'systemctl is-active openstack-nova-api',
- refreshonly => true,
+ if hiera('nova::use_ipv6', false) {
+ $memcache_servers = suffix(any2array(normalize_ip_for_uri(hiera('memcached_node_ips_v6'))), ':11211')
+ } else {
+ $memcache_servers = suffix(any2array(normalize_ip_for_uri(hiera('memcached_node_ips'))), ':11211')
+ }
+
+ class { '::nova::keystone::authtoken':
+ memcached_servers => $memcache_servers
}
- Nova_config<||> ~> Exec['stop_nova-api']
- Exec['stop_nova-api'] -> Service['httpd']
class { '::nova::api':
- service_name => 'httpd', # Temporary: will be moved to t-h-t
- sync_db => $sync_db,
- sync_db_api => $sync_db,
+ sync_db => $sync_db,
+ sync_db_api => $sync_db,
}
include ::nova::wsgi::apache
include ::nova::network::neutron