From 83a6b09866c74ec9e522a0ce3b8d320cd2f06730 Mon Sep 17 00:00:00 2001
From: German Eichberger <German.eichberger@rackspace.com>
Date: Tue, 14 Mar 2017 11:16:35 -0400
Subject: [PATCH] Implement fix for Octavia host group name

Octavia was hitting bug
https://bugs.launchpad.net/openstack-ansible/+bug/1623584
This implements a fix.

Change-Id: Ib892d85135697bc283394460ce33b31b4ffb3080
---
 etc/openstack_deploy/conf.d/octavia.yml.aio                  | 2 +-
 playbooks/inventory/env.d/octavia.yml                        | 2 +-
 releasenotes/notes/add-octavia-to-repo-f9d0fd8cee969181.yaml | 2 +-
 tests/test_inventory.py                                      | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/etc/openstack_deploy/conf.d/octavia.yml.aio b/etc/openstack_deploy/conf.d/octavia.yml.aio
index 12c29724d9..dd92356538 100644
--- a/etc/openstack_deploy/conf.d/octavia.yml.aio
+++ b/etc/openstack_deploy/conf.d/octavia.yml.aio
@@ -1,4 +1,4 @@
 # The controller host that the octavia control plane will be run on
-octavia_hosts:
+octavia-infra_hosts:
   aio1:
     ip: 172.29.236.100
diff --git a/playbooks/inventory/env.d/octavia.yml b/playbooks/inventory/env.d/octavia.yml
index 000c9119d0..a444cfd303 100644
--- a/playbooks/inventory/env.d/octavia.yml
+++ b/playbooks/inventory/env.d/octavia.yml
@@ -44,6 +44,6 @@ physical_skel:
   octavia-infra_containers:
     belongs_to:
       - all_containers
-  octavia_hosts:
+  octavia-infra_hosts:
     belongs_to:
       - hosts
diff --git a/releasenotes/notes/add-octavia-to-repo-f9d0fd8cee969181.yaml b/releasenotes/notes/add-octavia-to-repo-f9d0fd8cee969181.yaml
index babd5ea917..b24b243248 100644
--- a/releasenotes/notes/add-octavia-to-repo-f9d0fd8cee969181.yaml
+++ b/releasenotes/notes/add-octavia-to-repo-f9d0fd8cee969181.yaml
@@ -2,4 +2,4 @@
 features:
   - Experimental support has been added to allow the deployment of
     the OpenStack Octavia Load Balancing service when hosts are present
-    in the host group ``octavia_hosts``.
+    in the host group ``octavia-infra_hosts``.
diff --git a/tests/test_inventory.py b/tests/test_inventory.py
index a14bdf7dd5..4e4199ac62 100644
--- a/tests/test_inventory.py
+++ b/tests/test_inventory.py
@@ -257,7 +257,7 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'magnum-infra_hosts',
         'magnum_all',
         'magnum_container',
-        'octavia_hosts',
+        'octavia-infra_hosts',
         'octavia_all',
         'octavia-api',
         'octavia_server_container',
@@ -265,6 +265,7 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'octavia-housekeeping',
         'octavia-health-manager',
         'octavia-infra_containers',
+        'octavia-infra_all',
         'trove_all',
         'trove_api',
         'trove_conductor',