Remove manual memcache deployment in barbican
Change-Id: If6028b1825e2652b90b3dfa03107b3109cc5542e
This commit is contained in:
parent
882b4f2747
commit
9695e25428
@ -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)
|
||||
|
@ -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 %}
|
Loading…
x
Reference in New Issue
Block a user