commit 6887f57a3f6ec7b3be95d960d29cde79ac17079f
author Ales Komarek <akomarek@mirantis.com> Mon Jul 03 12:36:39 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Mon Jul 03 12:36:41 2017 +0000
tree a56aa27c0edba5f6bacade75f1018aed55db757e
parent 4684eaa7411fb825ed776c309a332c5e8fbb6d02
parent 7377b695b1c42662fb3c90ffb95908501f87a110

Merge "Don't inherit Octavia-specific gtw class from openstack_gateway_*"

reclass/storage/system/openstack_gateway_cluster_octavia.yml

diff --git a/reclass/storage/system/openstack_gateway_cluster_octavia.yml b/reclass/storage/system/openstack_gateway_cluster_octavia.yml
deleted file mode 100644
index 8126ed1..0000000
--- a/reclass/storage/system/openstack_gateway_cluster_octavia.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-classes:
-- system.reclass.storage.system.openstack_gateway_cluster
-parameters:
-  reclass:
-    storage:
-      node:
-        openstack_gateway_node01:
-          classes:
-          - system.octavia.manager.single

reclass/storage/system/openstack_gateway_single_octavia.yml

diff --git a/reclass/storage/system/openstack_gateway_single_octavia.yml b/reclass/storage/system/openstack_gateway_single_octavia.yml
index f43e6a1..264b3f1 100644
--- a/reclass/storage/system/openstack_gateway_single_octavia.yml
+++ b/reclass/storage/system/openstack_gateway_single_octavia.yml
@@ -1,5 +1,3 @@
-classes:
-- system.reclass.storage.system.openstack_gateway_single
 parameters:
   reclass:
     storage: