From 695b7e74b010b6457770fddb048723af5a525179 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 6 Feb 2022 22:59:30 +0900
Subject: [PATCH] Use p-o-i manifests in acceptance test

Depends-on: https://review.opendev.org/828029
Change-Id: I2ff1e2dba2a7ceff286e7c6f6788ec537a3ba37d
---
 spec/acceptance/octavia_spec.rb | 64 ++-------------------------------
 1 file changed, 3 insertions(+), 61 deletions(-)

diff --git a/spec/acceptance/octavia_spec.rb b/spec/acceptance/octavia_spec.rb
index dc3bddb5..4abac5e7 100644
--- a/spec/acceptance/octavia_spec.rb
+++ b/spec/acceptance/octavia_spec.rb
@@ -12,67 +12,9 @@ describe 'basic octavia' do
       include openstack_integration::rabbitmq
       include openstack_integration::mysql
       include openstack_integration::keystone
-      if $::osfamily == 'RedHat' {
-        include openstack_integration::placement
-        include openstack_integration::nova
-      }
-
-      rabbitmq_user { 'octavia':
-        admin    => true,
-        password => 'an_even_bigger_secret',
-        provider => 'rabbitmqctl',
-        require  => Class['rabbitmq'],
-      }
-
-      rabbitmq_user_permissions { 'octavia@/':
-        configure_permission => '.*',
-        write_permission     => '.*',
-        read_permission      => '.*',
-        provider             => 'rabbitmqctl',
-        require              => Class['rabbitmq'],
-      }
-
-      class { 'octavia::db::mysql':
-        password => 'a_big_secret',
-      }
-      class { 'octavia::keystone::auth':
-        password => 'a_big_secret',
-      }
-
-      # Octavia is not packaged on Ubuntu platform.
-      if $::osfamily == 'RedHat' {
-        class { 'octavia::db':
-          database_connection => 'mysql+pymysql://octavia:a_big_secret@127.0.0.1/octavia?charset=utf8',
-        }
-        class { 'octavia::logging':
-          debug => true,
-        }
-        class { 'octavia':
-          default_transport_url => 'rabbit://octavia:an_even_bigger_secret@127.0.0.1:5672/',
-        }
-        class { 'octavia::keystone::authtoken':
-          password => 'octavia_pass',
-        }
-        class { 'octavia::api':
-          sync_db => true,
-        }
-        class { 'octavia::controller':
-          amp_flavor_id => '65',
-        }
-        class { 'octavia::worker':
-        }
-        class { 'octavia::health_manager':
-          heartbeat_key => 'abcdefghijkl',
-        }
-        class { 'octavia::housekeeping':
-        }
-
-        # We create Nova flavor on the same node where Nova runs
-        Keystone_user_role <||>-> Nova_flavor<||>
-        Keystone_user <||>-> Nova_flavor<||>
-        Keystone_endpoint <||>-> Nova_flavor<||>
-
-      }
+      include openstack_integration::placement
+      include openstack_integration::nova
+      include openstack_integration::octavia
       EOS
 
       # Run it twice and test for idempotency