From 84a33ab65f0e6f68ff7f3f31b342b4d00e863d3e Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Mon, 26 Nov 2018 20:59:47 +0100 Subject: [PATCH] Re-include octavia::db in octavia::api The Octavia API service needs to be configured to talk to the database. Until recently it was being configured properly via the dependency on class octavia::controller. Commit 0ea4e10 reverted the inclusion of the controller class but did not re-include the db class. Change-Id: I5744ace634f9312cbedfe419f4fb878bc8052dfa --- manifests/api.pp | 1 + manifests/worker.pp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/api.pp b/manifests/api.pp index 65092215..fbde3830 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -72,6 +72,7 @@ class octavia::api ( include ::octavia::deps include ::octavia::policy + include ::octavia::db if $auth_strategy == 'keystone' { include ::octavia::keystone::authtoken diff --git a/manifests/worker.pp b/manifests/worker.pp index b78aa608..b65dc134 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -144,7 +144,7 @@ class octavia::worker ( $timeout_member_data or $timeout_tcp_inspect ) { warning('The amp_flavor_id, amp_image_tag, amp_secgroup_list, amp_boot_network_list, loadbalancer_topology, amphora_driver, compute_driver, network_driver, amp_ssh_key_name, enable_ssh_access, timeout_member_connect, timeout_member_data and - timeout_tcp_inspect parameters are deprecated and have been moved to octavia::controller class. Please set them there, you must + timeout_tcp_inspect parameters are deprecated and have been moved to octavia::controller class. Please set them there, you must set octavia::controller class before octavia::worker!') }