Bug fix and flake8

* We should bypass deployment data for envs without gitrepo assigned

Change-Id: I00e0d89e1b579eac4430966dbea3de3cf09f31b6
This commit is contained in:
Ukov Dmitry 2016-08-30 11:02:13 +03:00
parent be235c1ac5
commit e021a96831
5 changed files with 13 additions and 13 deletions

View File

@ -33,6 +33,8 @@ class OpenStackConfigPipeline(BasePipeline):
value: 6000
"""
repo = GitRepo.get_by_cluster_id(cluster.id)
if not repo:
return data
GitRepo.checkout(repo)
repo_path = os.path.join(const.REPOS_DIR, repo.repo_name)
resource_mapping = ExternalGit.ext_settings['resource_mapping']

View File

@ -3,7 +3,6 @@ from __future__ import absolute_import
import os
import fabric.api
from git import Repo
from fabric.context_managers import hide
from cliff import command
from cliff import lister
@ -232,7 +231,7 @@ class DownloadConfgs(command.Command):
return parser
def take_action(self, parsed_args):
#TODO(dukov) REFACTORING of this ugly staff
# TODO(dukov) REFACTORING of this ugly staff
ext_settings = GitExtensionSettings().config
key = parsed_args.key_path
if not key:
@ -308,4 +307,4 @@ class DownloadConfgs(command.Command):
push_result = gitrepo.remotes.origin.\
push(refspec='HEAD:' + cfg_branch)
print("Push result {}".format(push_result))
return ((),{})
return ((), {})

View File

@ -3,17 +3,16 @@ from sqlalchemy import Integer
from sqlalchemy import String
from sqlalchemy import UnicodeText
from sqlalchemy.dialects import postgresql as psql
from nailgun.db import db
from nailgun.errors import errors
from nailgun.db.sqlalchemy.models.base import Base
class GitRepo(Base):
__tablename__ = 'fuel_external_git_repos'
id = Column(Integer, primary_key=True)
repo_name = Column(UnicodeText, nullable=False)
env_id = Column(Integer, unique=True, nullable=False)
git_url = Column(String(255), default='', server_default='', nullable=False)
git_url = Column(String(255), default='', server_default='',
nullable=False)
ref = Column(String(255), default='', server_default='', nullable=False)
user_key = Column(String(255), default='', server_default='', nullable=False)
user_key = Column(String(255), default='', server_default='',
nullable=False)

View File

@ -11,12 +11,12 @@ class OpenStackConfig(object):
self.config.read(config_file)
self.config_name = self._get_resource_name(cf_basename,
resource_mapping)
logger.debug("Initalized Config {0}. Config resource name {1}.".\
format(config_file, self.config_name))
logger.debug("Initalized Config {0}. Config resource name {1}.".
format(config_file, self.config_name))
def _get_resource_name(self, config_file, resource_mapping):
res = "{}_config".format("".join(config_file.split('.')[:-1]))
for resource_name, val in resource_mapping.items():
for resource_name, val in resource_mapping.items():
if val['alias'] == config_file:
res = resource_name
break

View File

@ -20,4 +20,4 @@ class GitExtensionSettings(object):
self.config.update(yaml.load(custom_config.read()))
except Exception as e:
logger.error("Error while reading config file %s: %s" %
(sf, str(e)))
(sf, str(e)))