Remove deployment graph config for patching

Patching feature was obsoleted and is not supported anymore.

Delete deployment graph configuration for patching. Delete condition that
yields this configuration when cluster asked for deployment graph.

Closes-bug: 1511499
Change-Id: I7d73aba5b090a5d24729553fdab76bbbaea34ebd
This commit is contained in:
Oleg Gelbukh 2015-10-28 21:01:59 +00:00
parent ca678db51a
commit 81fb99fc72
2 changed files with 0 additions and 91 deletions

View File

@ -24,7 +24,6 @@ from distutils.version import StrictVersion
import six
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql as psql
import yaml
from nailgun import consts
@ -38,7 +37,6 @@ from nailgun.objects import NailgunCollection
from nailgun.objects import NailgunObject
from nailgun.objects import Release
from nailgun.objects.serializers.cluster import ClusterSerializer
from nailgun.orchestrator import graph_configuration
from nailgun.plugins.manager import PluginManager
from nailgun.settings import settings
from nailgun.utils import AttributesGenerator
@ -812,8 +810,6 @@ class Cluster(NailgunObject):
"""
if instance.deployment_tasks:
return instance.deployment_tasks
elif instance.pending_release_id:
return yaml.load(graph_configuration.PATCHING)
else:
release_deployment_tasks = \
Release.get_deployment_tasks(instance.release)

View File

@ -198,90 +198,3 @@ DEPLOYMENT_50 = """
puppet_modules: /etc/puppet/modules
timeout: 3600
"""
PATCHING = """
- id: deploy_start
type: stage
- id: deploy_end
type: stage
requires: [deploy_start]
- id: primary-controller
type: group
role: [primary-controller]
required_for: [deploy_end]
requires: [deploy_start]
parameters:
strategy:
type: one_by_one
- id: controller
type: group
role: [controller]
requires: [primary-controller]
required_for: [deploy_end]
parameters:
strategy:
type: one_by_one
- id: cinder
type: group
role: [cinder]
requires: [controller]
required_for: [deploy_end]
parameters:
strategy:
type: one_by_one
- id: compute
type: group
role: [compute]
requires: [controller]
required_for: [deploy_end]
parameters:
strategy:
type: one_by_one
- id: zabbix-server
type: group
role: [zabbix-server]
required_for: [deploy_end]
requires: [deploy_start]
parameters:
strategy:
type: one_by_one
- id: mongo
type: group
role: [mongo]
requires: [zabbix-server]
required_for: [deploy_end, primary-controller, controller]
parameters:
strategy:
type: one_by_one
- id: primary-mongo
type: group
role: [primary-mongo]
requires: [mongo]
required_for: [deploy_end, primary-controller, controller]
parameters:
strategy:
type: one_by_one
- id: ceph-osd
type: group
role: [ceph-osd]
requires: [controller]
required_for: [deploy_end]
parameters:
strategy:
type: one_by_one
- id: deploy_legacy
type: puppet
groups: [primary-controller, controller,
cinder, compute, ceph-osd,
zabbix-server, primary-mongo, mongo]
required_for: [deploy_end]
requires: [deploy_start]
parameters:
puppet_manifest: /etc/puppet/manifests/site.pp
puppet_modules: /etc/puppet/modules
timeout: 3600
"""