Merge "Add 'octavia' in to the list of paths to search for custom configs"

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"

ansible/roles/kolla-openstack/defaults/main.yml

@@ -365,6 +365,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.
 

ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml

@@ -78,6 +78,7 @@ provisioner:
         kolla_extra_nova: |
           [extra-nova.conf]
           foo=bar
+        kolla_enable_octavia: true
         kolla_enable_sahara: true
         kolla_extra_sahara: |
           [extra-sahara.conf]

ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py

@@ -47,6 +47,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
      'murano',
      'neutron',
      'nova',
+     'octavia',
      'sahara',
      'storm',
      'swift',

ansible/roles/kolla-openstack/vars/main.yml

@@ -133,6 +133,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"