From 43b6276f36586f58968b9a54fc429e5651e8a070 Mon Sep 17 00:00:00 2001
From: Nick Jones <nick@stackhpc.com>
Date: Fri, 2 Nov 2018 18:45:54 +0000
Subject: [PATCH] Add 'octavia' in to the list of paths to search for custom
 configs

As it says on the tin. It's useful to add support for copying custom
configuration for Octavia into place via Kayobe, specifically for files
that need to be encrypted such as private certificates.

TrivialFix

Change-Id: I026513bf3d7e4f871c83efd0740f75191ffaa969
---
 ansible/group_vars/all/kolla                                | 3 +++
 ansible/roles/kolla-openstack/defaults/main.yml             | 6 ++++++
 .../kolla-openstack/molecule/enable-everything/molecule.yml | 1 +
 .../molecule/enable-everything/tests/test_default.py        | 1 +
 ansible/roles/kolla-openstack/vars/main.yml                 | 5 +++++
 5 files changed, 16 insertions(+)

diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index a659cf52d..ca6e198a2 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -182,6 +182,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_neutron_lbaas | bool }}"
   - regex: nova
     enabled: "{{ kolla_enable_nova | bool }}"
+  - regex: octavia
+    enabled: "{{ kolla_enable_octavia | bool }}"
   - regex: openvswitch
     enabled: "{{ kolla_enable_neutron | bool }}"
   - regex: rabbitmq
@@ -360,6 +362,7 @@ kolla_enable_neutron: "yes"
 kolla_enable_neutron_lbaas: "no"
 kolla_enable_neutron_provider_networks: "no"
 kolla_enable_nova: "yes"
+kolla_enable_octavia: "no"
 kolla_enable_osprofiler: "no"
 kolla_enable_prometheus: "no"
 kolla_enable_sahara: "no"
diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 51a127636..b8195f1c8 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -380,6 +380,12 @@ kolla_enable_nova:
 # Free form extra configuration to append to nova.conf.
 kolla_extra_nova:
 
+###############################################################################
+# Octavia configuration.
+
+# Whether to enable Octavia.
+kolla_enable_octavia:
+
 ###############################################################################
 # Sahara configuration.
 
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
index 64740f60a..f3787b287 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
@@ -80,6 +80,7 @@ provisioner:
         kolla_extra_nova: |
           [extra-nova.conf]
           foo=bar
+        kolla_enable_octavia: true
         kolla_enable_sahara: true
         kolla_extra_sahara: |
           [extra-sahara.conf]
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
index 6e0a3e32d..12ba52b1b 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
@@ -46,6 +46,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
      'murano',
      'neutron',
      'nova',
+     'octavia',
      'sahara',
      'storm',
      'swift',
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index f0ede72fc..c661a1346 100644
--- a/ansible/roles/kolla-openstack/vars/main.yml
+++ b/ansible/roles/kolla-openstack/vars/main.yml
@@ -129,6 +129,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/nova"
     patterns: "*"
     enabled: "{{ kolla_enable_nova }}"
+  # Octavia.
+  - src: "{{ kolla_extra_config_path }}/octavia"
+    dest: "{{ kolla_node_custom_config_path }}/octavia"
+    patterns: "*"
+    enabled: "{{ kolla_enable_octavia }}"
   # Sahara.
   - src: "{{ kolla_extra_config_path }}/sahara"
     dest: "{{ kolla_node_custom_config_path }}/sahara"