Browse Source

Speed-up Memcached deployment

Change-Id: Id1d9c99fbd1ca43a4719c62553bcfbbe26ac5ac8
changes/45/745445/5
Mohammed Naser 10 months ago
parent
commit
dfe5f77ee5
16 changed files with 63 additions and 159 deletions
  1. +2
    -0
      .pylintrc
  2. +0
    -4
      devstack/lib/heat
  3. +1
    -2
      devstack/lib/horizon
  4. +0
    -4
      devstack/lib/keystone
  5. +2
    -3
      openstack_operator/glance.py
  6. +2
    -3
      openstack_operator/heat.py
  7. +2
    -2
      openstack_operator/horizon.py
  8. +2
    -1
      openstack_operator/keystone.py
  9. +2
    -3
      openstack_operator/magnum.py
  10. +37
    -1
      openstack_operator/operator.py
  11. +0
    -32
      openstack_operator/templates/glance/memcached.yml.j2
  12. +0
    -32
      openstack_operator/templates/horizon/memcached.yml.j2
  13. +0
    -32
      openstack_operator/templates/keystone/memcached.yml.j2
  14. +0
    -32
      openstack_operator/templates/magnum/memcached.yml.j2
  15. +5
    -8
      openstack_operator/templates/operator/memcached.yml.j2
  16. +8
    -0
      setup.cfg

+ 2
- 0
.pylintrc View File

@ -0,0 +1,2 @@
[SIMILARITIES]
ignore-imports=yes

+ 0
- 4
devstack/lib/heat View File

@ -250,10 +250,6 @@ function start_heat {
proxy_pass_to_kubernetes /heat-api heat-api heat-wsgi-api
proxy_pass_to_kubernetes /heat-api-cfn heat-api-cfn heat-wsgi-api-cfn
# (re)start memcached to make sure we have a clean memcache.
kubectl rollout restart statefulset/memcached-heat
sleep 10
}
# stop_heat() - Stop running processes


+ 1
- 2
devstack/lib/horizon View File

@ -42,8 +42,7 @@ function install_horizon {
# start_horizon() - Start running processes
function start_horizon {
kubectl rollout restart statefulset/memcached-horizon
sleep 10
echo noop
}
# stop_horizon() - Stop running processes


+ 0
- 4
devstack/lib/keystone View File

@ -59,10 +59,6 @@ function start_keystone {
if ! wait_for_service $SERVICE_TIMEOUT $service_uri; then
die $LINENO "keystone did not start"
fi
# (re)start memcached to make sure we have a clean memcache.
kubectl rollout restart statefulset/memcached-keystone
sleep 10
}
export -f start_keystone


+ 2
- 3
openstack_operator/glance.py View File

@ -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 glance instance
@ -37,9 +39,6 @@ def create_or_resume(name, spec, **_):
else:
database.ensure_mysql_cluster("glance", spec["mysql"])
# deploy memcached
utils.create_or_update('glance/memcached.yml.j2', spec=spec)
# deploy glance api
utils.create_or_update('glance/daemonset.yml.j2',
name=name, spec=spec)


+ 2
- 3
openstack_operator/heat.py View File

@ -24,6 +24,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 any Heat instances
@ -34,9 +36,6 @@ def create_or_resume(name, spec, **_):
else:
database.ensure_mysql_cluster("heat", spec["mysql"])
# deploy memcached
utils.create_or_update('heat/memcached.yml.j2', spec=spec)
# deploy rabbitmq
if not utils.ensure_secret("openstack", "heat-rabbitmq"):
utils.create_or_update('heat/secret-rabbitmq.yml.j2',


+ 2
- 2
openstack_operator/horizon.py View File

@ -21,6 +21,8 @@ the appropriate deployments, Mcrouter, pod monitors and Prometheus rules.
from openstack_operator import utils
MEMCACHED = True
def create_secret():
"""Create a new horizon secret for secretKey"""
@ -49,8 +51,6 @@ def create_or_resume(name, spec, **_):
spec=spec)
utils.create_or_update('horizon/service.yml.j2',
name=name, spec=spec)
utils.create_or_update('horizon/memcached.yml.j2',
name=name, spec=spec)
if "ingress" in spec:
utils.create_or_update('horizon/ingress.yml.j2',
name=name, spec=spec)


+ 2
- 1
openstack_operator/keystone.py View File

@ -27,6 +27,8 @@ from openstack_operator import database
from openstack_operator import filters
from openstack_operator import utils
MEMCACHED = True
TOKEN_EXPIRATION = 86400
FERNET_ROTATION_INTERVAL = 3600
ACTIVE_KEYS = int(TOKEN_EXPIRATION / FERNET_ROTATION_INTERVAL)
@ -113,7 +115,6 @@ def create_or_resume(name, spec, **_):
db_config = database.ensure_mysql_cluster("keystone", spec["mysql"])
# deploy memcached
utils.create_or_update('keystone/memcached.yml.j2', spec=spec)
# keystone config
utils.create_or_update('keystone/secret-config.yml.j2',


+ 2
- 3
openstack_operator/magnum.py View File

@ -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 any Magnum instances
@ -35,9 +37,6 @@ def create_or_resume(name, spec, **_):
spec["mysql"] = {}
database.ensure_mysql_cluster("magnum", spec["mysql"])
# deploy memcached
utils.create_or_update('magnum/memcached.yml.j2', spec=spec)
# deploy rabbitmq
if not utils.ensure_secret("openstack", "magnum-rabbitmq"):
utils.create_or_update('magnum/secret-rabbitmq.yml.j2',


+ 37
- 1
openstack_operator/operator.py View File

@ -19,6 +19,7 @@ the appropriate deployments, an instance of Keystone, Heat and Horizon
for the installation.
"""
import functools
import os
import pkg_resources
@ -51,7 +52,42 @@ def operator_configmap(namespace, name, **_):
"""Filter on the operator's ConfigMap."""
return namespace == os.getenv('OPERATOR_NAMESPACE', 'default') \
and name == OPERATOR_CONFIGMAP
and name == "operator-config"
async def deploy_memcached(item, **_):
"""
Deploy a generic instance of Memcached
This function deploys a generic instance of Memcached with sane defaults,
it's meant to be here to be consumed/called by the function below.
"""
utils.create_or_update('operator/memcached.yml.j2', name=item, adopt=True)
@kopf.on.resume('', 'v1', 'configmaps', when=operator_configmap)
@kopf.on.create('', 'v1', 'configmaps', when=operator_configmap)
@kopf.on.update('', 'v1', 'configmaps', when=operator_configmap)
async def deploy_memcacheds(body, **_):
"""
Deploy multiple Memcached instances for OpenStack services
This function makes sure that Memcached is deployed for all services which
use it when when the operator sees any changes to the configuration.
"""
fns = {}
services = utils.to_dict(body['data']['operator-config.yaml']).keys()
for entry_point in pkg_resources.iter_entry_points('operators'):
if entry_point.name not in services:
continue
module = entry_point.load()
if hasattr(module, 'MEMCACHED') and module.MEMCACHED:
fns[entry_point.name] = \
functools.partial(deploy_memcached, item=entry_point.name)
await kopf.execute(fns=fns)
@kopf.on.resume('', 'v1', 'configmaps', when=operator_configmap)


+ 0
- 32
openstack_operator/templates/glance/memcached.yml.j2 View File

@ -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: glance
namespace: openstack
labels:
{{ labels("glance") | 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 %}

+ 0
- 32
openstack_operator/templates/horizon/memcached.yml.j2 View File

@ -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: horizon
namespace: openstack
labels:
{{ labels("horizon", name) | 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 %}

+ 0
- 32
openstack_operator/templates/keystone/memcached.yml.j2 View File

@ -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: keystone
namespace: openstack
labels:
{{ labels("keystone") | 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 %}

+ 0
- 32
openstack_operator/templates/magnum/memcached.yml.j2 View File

@ -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: magnum
namespace: openstack
labels:
{{ labels("magnum") | 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 %}

openstack_operator/templates/heat/memcached.yml.j2 → openstack_operator/templates/operator/memcached.yml.j2 View File


+ 8
- 0
setup.cfg View File

@ -1,6 +1,14 @@
[metadata]
name = openstack-operator
[entry_points]
operators =
glance = openstack_operator.glance
heat = openstack_operator.heat
horizon = openstack_operator.horizon
keystone = openstack_operator.keystone
magnum = openstack_operator.magnum
[files]
packages =
openstack_operator

Loading…
Cancel
Save