aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--manifests/profile/base/nova/api.pp24
-rw-r--r--manifests/profile/base/rabbitmq.pp3
-rw-r--r--manifests/profile/base/swift/proxy.pp1
-rw-r--r--manifests/profile/base/swift/storage.pp1
4 files changed, 14 insertions, 15 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
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index 2fd2347..b521999 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -54,7 +54,8 @@ class tripleo::profile::base::rabbitmq (
# IPv6 environment, necessary for RabbitMQ.
if $ipv6 {
$rabbit_env = merge($environment, {
- 'RABBITMQ_SERVER_START_ARGS' => '"-proto_dist inet6_tcp"'
+ 'RABBITMQ_SERVER_START_ARGS' => '"-proto_dist inet6_tcp"',
+ 'RABBITMQ_CTL_ERL_ARGS' => '"-proto_dist inet6_tcp"'
})
} else {
$rabbit_env = $environment
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 8cb1132..feabf86 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -38,6 +38,7 @@ class tripleo::profile::base::swift::proxy (
) {
if $step >= 4 {
$swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}")
+ include ::swift::config
include ::swift::proxy
include ::swift::proxy::proxy_logging
include ::swift::proxy::healthcheck
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
index d1660de..568be66 100644
--- a/manifests/profile/base/swift/storage.pp
+++ b/manifests/profile/base/swift/storage.pp
@@ -34,6 +34,7 @@ class tripleo::profile::base::swift::storage (
) {
if $step >= 4 {
if $enable_swift_storage {
+ include ::swift::config
include ::swift::storage::disks
include ::swift::storage::all
if(!defined(File['/srv/node'])) {