From 07876f2d90aaa9f091a8c50d15bab3675a6b844c Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Tue, 20 Dec 2016 12:11:42 -0330
Subject: [PATCH] Add registry and role service list entries for Octavia

This patch adds the Octavia services to the registry and controller role
(disabled by default). Also included is an example environment file for
enabling the services and required configuration. The API service
profile is also amended configure the load balancer service provider in
neutron to point to the octavia load balancer driver.

Change-Id: I7f3bba950f5b1574ba842a39e93a8ac2b1ccf7bb
Partially-implements: blueprint octavia-service-integration
---
 environments/services/octavia.yaml                       | 9 +++++++++
 overcloud-resource-registry-puppet.j2.yaml               | 4 ++++
 puppet/services/octavia-api.yaml                         | 4 +++-
 .../octavia-service-integration-03bd3eb6cfe1efaf.yaml    | 4 ++++
 roles_data.yaml                                          | 4 ++++
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 environments/services/octavia.yaml
 create mode 100644 releasenotes/notes/octavia-service-integration-03bd3eb6cfe1efaf.yaml

diff --git a/environments/services/octavia.yaml b/environments/services/octavia.yaml
new file mode 100644
index 0000000000..24c57b8c3c
--- /dev/null
+++ b/environments/services/octavia.yaml
@@ -0,0 +1,9 @@
+resource_registry:
+  OS::TripleO::Services::OctaviaApi: ../../puppet/services/octavia-api.yaml
+  OS::TripleO::Services::OctaviaHealthManager: ../../puppet/services/octavia-health-manager.yaml
+  OS::TripleO::Services::OctaviaHousekeeping: ../../puppet/services/octavia-housekeeping.yaml
+  OS::TripleO::Services::OctaviaWorker: ../../puppet/services/octavia-worker.yaml
+
+parameter_defaults:
+    NeutronServicePlugins: "qos,router,trunk,lbaasv2"
+    NeutronEnableForceMetadata: true
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 1b9646fe35..653e5c2df7 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -241,6 +241,10 @@ resource_registry:
   OS::TripleO::Services::Etcd: OS::Heat::None
   OS::TripleO::Services::Ec2Api: OS::Heat::None
   OS::TripleO::Services::AuditD: OS::Heat::None
+  OS::TripleO::Services::OctaviaApi: OS::Heat::None
+  OS::TripleO::Services::OctaviaHealthManager: OS::Heat::None
+  OS::TripleO::Services::OctaviaHousekeeping: OS::Heat::None
+  OS::TripleO::Services::OctaviaWorker: OS::Heat::None
 
 parameter_defaults:
   EnablePackageInstall: false
diff --git a/puppet/services/octavia-api.yaml b/puppet/services/octavia-api.yaml
index 4c6f4c37ea..58223bafdd 100644
--- a/puppet/services/octavia-api.yaml
+++ b/puppet/services/octavia-api.yaml
@@ -70,13 +70,15 @@ outputs:
                   - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
             octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
             octavia::keystone::authtoken::project_name: 'service'
+            octavia::keystone::authtoken::password: {get_param: OctaviaPassword}
             octavia::api::sync_db: true
             tripleo.octavia_api.firewall_rules:
               '120 octavia api':
                 dport:
                   - 9876
                   - 13876
-            octavia::host: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
+            octavia::api::host: {get_param: [ServiceNetMap, OctaviaApiNetwork]}
+            neutron::server::service_providers: ['LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default']
       step_config: |
         include tripleo::profile::base::octavia::api
       service_config_settings:
diff --git a/releasenotes/notes/octavia-service-integration-03bd3eb6cfe1efaf.yaml b/releasenotes/notes/octavia-service-integration-03bd3eb6cfe1efaf.yaml
new file mode 100644
index 0000000000..bd8d3562e6
--- /dev/null
+++ b/releasenotes/notes/octavia-service-integration-03bd3eb6cfe1efaf.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Added initial support for deploying the Octavia services in the overcloud.
diff --git a/roles_data.yaml b/roles_data.yaml
index b429146326..f5d5fc606f 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -113,6 +113,10 @@
     - OS::TripleO::Services::CinderHPELeftHandISCSI
     - OS::TripleO::Services::Etcd
     - OS::TripleO::Services::AuditD
+    - OS::TripleO::Services::OctaviaApi
+    - OS::TripleO::Services::OctaviaHealthManager
+    - OS::TripleO::Services::OctaviaHousekeeping
+    - OS::TripleO::Services::OctaviaWorker
 
 - name: Compute
   CountDefault: 1