From 9695e25428e85d2aceaf8f6d95ce5597bf9202e4 Mon Sep 17 00:00:00 2001
From: okozachenko <okozachenko@vexxhost.com>
Date: Tue, 18 Aug 2020 14:47:41 +0300
Subject: [PATCH] Remove manual memcache deployment in barbican

Change-Id: If6028b1825e2652b90b3dfa03107b3109cc5542e
---
 openstack_operator/barbican.py                |  5 ++-
 .../templates/barbican/memcached.yml.j2       | 32 -------------------
 setup.cfg                                     |  1 +
 3 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 openstack_operator/templates/barbican/memcached.yml.j2

diff --git a/openstack_operator/barbican.py b/openstack_operator/barbican.py
index 1443b3dd..bbe1399b 100644
--- a/openstack_operator/barbican.py
+++ b/openstack_operator/barbican.py
@@ -23,6 +23,8 @@ from openstack_operator import database
 from openstack_operator import identity
 from openstack_operator import utils
 
+MEMCACHED = True
+
 
 def create_or_resume(name, spec, **_):
     """Create and re-sync a barbican instance
@@ -34,9 +36,6 @@ def create_or_resume(name, spec, **_):
     else:
         database.ensure_mysql_cluster("barbican", spec["mysql"])
 
-    # deploy memcached
-    utils.create_or_update('barbican/memcached.yml.j2', spec=spec)
-
     # deploy barbican api
     utils.create_or_update('barbican/daemonset.yml.j2',
                            name=name, spec=spec)
diff --git a/openstack_operator/templates/barbican/memcached.yml.j2 b/openstack_operator/templates/barbican/memcached.yml.j2
deleted file mode 100644
index 2bc4d387..00000000
--- a/openstack_operator/templates/barbican/memcached.yml.j2
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Copyright 2020 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: infrastructure.vexxhost.cloud/v1alpha1
-kind: Memcached
-metadata:
-  name: barbican
-  namespace: openstack
-  labels:
-    {{ labels("barbican") | indent(4) }}
-spec:
-  megabytes: 128
-{% if 'nodeSelector' in spec %}
-  nodeSelector:
-    {{ spec.nodeSelector | to_yaml | indent(4) }}
-{% endif %}
-{% if 'tolerations' in spec %}
-  tolerations:
-    {{ spec.tolerations | to_yaml | indent(4) }}
-{% endif %}
diff --git a/setup.cfg b/setup.cfg
index f971d09e..0e41f74e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,6 +3,7 @@ name = openstack-operator
 
 [entry_points]
 operators =
+    barbican = openstack_operator.barbican
     glance = openstack_operator.glance
     heat = openstack_operator.heat
     horizon = openstack_operator.horizon