Rename microservices to fuel-ccp
Change-Id: I883f2a583fd3ff497df91c216d4fae6a7b6a6d6e
This commit is contained in:
parent
bbc090fa10
commit
5cb0d7a9fe
|
@ -1,4 +1,4 @@
|
|||
microservices Style Commandments
|
||||
===============================================
|
||||
Fuel-ccp Style Commandments
|
||||
===========================
|
||||
|
||||
Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
|
||||
|
|
12
README.rst
12
README.rst
|
@ -1,6 +1,6 @@
|
|||
===============================
|
||||
microservices
|
||||
===============================
|
||||
========
|
||||
fuel-ccp
|
||||
========
|
||||
|
||||
Docker images builder for OpenStack services and infra.
|
||||
|
||||
|
@ -9,9 +9,9 @@ Please feel here a long description which must be at least 3 lines wrapped on
|
|||
Note that this is a hard requirement.
|
||||
|
||||
* Free software: Apache license
|
||||
* Documentation: http://docs.openstack.org/developer/microservices
|
||||
* Source: http://git.openstack.org/cgit/nextgen/microservices
|
||||
* Bugs: http://bugs.launchpad.net/microservices
|
||||
* Documentation: http://docs.openstack.org/developer/fuel-ccp
|
||||
* Source: http://git.openstack.org/cgit/openstack/fuel-ccp
|
||||
* Bugs: http://bugs.launchpad.net/fuel-ccp
|
||||
|
||||
Features
|
||||
--------
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
.. microservices documentation master file, created by
|
||||
.. Fuel-ccp documentation master file, created by
|
||||
sphinx-quickstart on Tue Jul 9 22:26:36 2013.
|
||||
You can adapt this file completely to your liking, but it should at least
|
||||
contain the root `toctree` directive.
|
||||
|
||||
Welcome to microservices's documentation!
|
||||
Welcome to Fuel-ccp's documentation!
|
||||
========================================================
|
||||
|
||||
Contents:
|
||||
|
|
|
@ -4,9 +4,9 @@ Installation
|
|||
|
||||
At the command line::
|
||||
|
||||
$ pip install microservices
|
||||
$ pip install fuel-ccp
|
||||
|
||||
Or, if you have virtualenvwrapper installed::
|
||||
|
||||
$ mkvirtualenv microservices
|
||||
$ pip install microservices
|
||||
$ mkvirtualenv fuel-ccp
|
||||
$ pip install fuel-ccp
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
========
|
||||
=====
|
||||
Usage
|
||||
========
|
||||
=====
|
||||
|
||||
To use microservices in a project::
|
||||
To use fuel-ccp in a project::
|
||||
|
||||
import microservices
|
||||
import fuel_ccp
|
||||
|
|
|
@ -15,5 +15,5 @@
|
|||
import pbr.version
|
||||
|
||||
|
||||
version_info = pbr.version.VersionInfo("microservices")
|
||||
version_info = pbr.version.VersionInfo("fuel_ccp")
|
||||
__version__ = version_info.version_string()
|
|
@ -11,17 +11,17 @@ import docker
|
|||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from microservices.common import jinja_utils
|
||||
from microservices.common import utils
|
||||
from fuel_ccp.common import jinja_utils
|
||||
from fuel_ccp.common import utils
|
||||
|
||||
|
||||
BUILD_TIMEOUT = 2 ** 16 # in seconds
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_group('builder', 'microservices.config.builder')
|
||||
CONF.import_group('images', 'microservices.config.images')
|
||||
CONF.import_group('repositories', 'microservices.config.repositories')
|
||||
CONF.import_group('registry', 'microservices.config.registry')
|
||||
CONF.import_group('builder', 'fuel_ccp.config.builder')
|
||||
CONF.import_group('images', 'fuel_ccp.config.images')
|
||||
CONF.import_group('repositories', 'fuel_ccp.config.repositories')
|
||||
CONF.import_group('registry', 'fuel_ccp.config.registry')
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -4,15 +4,15 @@ import sys
|
|||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from microservices import build
|
||||
from microservices import deploy
|
||||
from microservices import fetch
|
||||
from fuel_ccp import build
|
||||
from fuel_ccp import deploy
|
||||
from fuel_ccp import fetch
|
||||
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_group('registry', 'microservices.config.registry')
|
||||
CONF.import_group('repositories', 'microservices.config.repositories')
|
||||
CONF.import_opt('action', 'microservices.config.cli')
|
||||
CONF.import_group('registry', 'fuel_ccp.config.registry')
|
||||
CONF.import_group('repositories', 'fuel_ccp.config.repositories')
|
||||
CONF.import_opt('action', 'fuel_ccp.config.cli')
|
||||
|
||||
|
||||
def do_build():
|
||||
|
@ -42,7 +42,7 @@ def main():
|
|||
signal.signal(signal.SIGINT, signal_handler)
|
||||
logging.register_options(CONF)
|
||||
CONF(sys.argv[1:])
|
||||
logging.setup(CONF, 'microservices')
|
||||
logging.setup(CONF, 'fuel-ccp')
|
||||
|
||||
func = globals()['do_%s' % CONF.action.name]
|
||||
func()
|
|
@ -5,7 +5,7 @@ from oslo_config import cfg
|
|||
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_group('images', 'microservices.config.images')
|
||||
CONF.import_group('images', 'fuel_ccp.config.images')
|
||||
|
||||
|
||||
def str_to_bool(text):
|
|
@ -5,12 +5,12 @@ from oslo_config import cfg
|
|||
from oslo_log import log as logging
|
||||
import yaml
|
||||
|
||||
import microservices
|
||||
import fuel_ccp
|
||||
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_group('repositories', 'microservices.config.repositories')
|
||||
CONF.import_opt("deploy_config", "microservices.config.cli")
|
||||
CONF.import_group('repositories', 'fuel_ccp.config.repositories')
|
||||
CONF.import_opt("deploy_config", "fuel_ccp.config.cli")
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -20,8 +20,7 @@ def k8s_name(*args):
|
|||
|
||||
|
||||
def get_resource_path(path):
|
||||
return pkg_resources.resource_filename(
|
||||
microservices.version_info.package, path)
|
||||
return pkg_resources.resource_filename(fuel_ccp.version_info.package, path)
|
||||
|
||||
|
||||
def get_global_parameters(config_group):
|
|
@ -5,15 +5,15 @@ import yaml
|
|||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from microservices.common import utils
|
||||
from microservices import kubernetes
|
||||
from microservices import templates
|
||||
from fuel_ccp.common import utils
|
||||
from fuel_ccp import kubernetes
|
||||
from fuel_ccp import templates
|
||||
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_group('repositories', 'microservices.config.repositories')
|
||||
CONF.import_opt("action", "microservices.config.cli")
|
||||
CONF.import_opt("deploy_config", "microservices.config.cli")
|
||||
CONF.import_group('repositories', 'fuel_ccp.config.repositories')
|
||||
CONF.import_opt("action", "fuel_ccp.config.cli")
|
||||
CONF.import_opt("deploy_config", "fuel_ccp.config.cli")
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -7,7 +7,7 @@ from oslo_log import log as logging
|
|||
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_group('repositories', 'microservices.config.repositories')
|
||||
CONF.import_group('repositories', 'fuel_ccp.config.repositories')
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -10,8 +10,8 @@ from oslo_log import log as logging
|
|||
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt("action", "microservices.config.cli")
|
||||
CONF.import_group('kubernetes', 'microservices.config.kubernetes')
|
||||
CONF.import_opt("action", "fuel_ccp.config.cli")
|
||||
CONF.import_group('kubernetes', 'fuel_ccp.config.kubernetes')
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -2,12 +2,12 @@ import copy
|
|||
|
||||
from oslo_config import cfg
|
||||
|
||||
from microservices.common import utils
|
||||
from fuel_ccp.common import utils
|
||||
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_group('images', 'microservices.config.images')
|
||||
CONF.import_group('registry', 'microservices.config.registry')
|
||||
CONF.import_group('images', 'fuel_ccp.config.images')
|
||||
CONF.import_group('registry', 'fuel_ccp.config.registry')
|
||||
|
||||
GLOBAL_CONFIG = "globals"
|
||||
SCRIPT_CONFIG = "start-script"
|
|
@ -1,8 +1,8 @@
|
|||
import os
|
||||
import sys
|
||||
|
||||
from microservices.common import jinja_utils
|
||||
from microservices.tests import base
|
||||
from fuel_ccp.common import jinja_utils
|
||||
from fuel_ccp.tests import base
|
||||
|
||||
|
||||
class TestJinjaUtils(base.TestCase):
|
|
@ -4,8 +4,8 @@ import io
|
|||
import mock
|
||||
from oslo_config import fixture as conf_fixture
|
||||
|
||||
from microservices import build
|
||||
from microservices.tests import base
|
||||
from fuel_ccp import build
|
||||
from fuel_ccp.tests import base
|
||||
|
||||
|
||||
BASE_DOCKERFILE = u"""FROM debian:jessie
|
||||
|
@ -66,7 +66,7 @@ class TestBuild(base.TestCase):
|
|||
io.StringIO(COMPONENT_DOCKERFILE.format(''))
|
||||
]
|
||||
dockerfiles = self.__create_dockerfile_objects()
|
||||
with mock.patch('microservices.build.open', m_open, create=True):
|
||||
with mock.patch('fuel_ccp.build.open', m_open, create=True):
|
||||
build.find_dependencies(dockerfiles)
|
||||
|
||||
self.assertListEqual([dockerfiles['ms-mysql']],
|
||||
|
@ -81,7 +81,7 @@ class TestBuild(base.TestCase):
|
|||
io.StringIO(COMPONENT_DOCKERFILE.format('example.com:8909/'))
|
||||
]
|
||||
dockerfiles = self.__create_dockerfile_objects()
|
||||
with mock.patch('microservices.build.open', m_open, create=True):
|
||||
with mock.patch('fuel_ccp.build.open', m_open, create=True):
|
||||
build.find_dependencies(dockerfiles)
|
||||
|
||||
self.assertListEqual([dockerfiles['ms-mysql']],
|
||||
|
@ -90,8 +90,8 @@ class TestBuild(base.TestCase):
|
|||
dockerfiles['ms-mysql']['parent'])
|
||||
|
||||
@mock.patch("docker.Client")
|
||||
@mock.patch("microservices.build.build_dockerfile")
|
||||
@mock.patch("microservices.build.submit_dockerfile_processing")
|
||||
@mock.patch("fuel_ccp.build.build_dockerfile")
|
||||
@mock.patch("fuel_ccp.build.submit_dockerfile_processing")
|
||||
def test_process_dockerfile_middle(self, submit_dockerfile_processing_mock,
|
||||
build_dockerfile_mock, dc_mock):
|
||||
dockerfiles = {
|
||||
|
@ -133,8 +133,8 @@ class TestBuild(base.TestCase):
|
|||
dockerfiles["leaf"], mock.ANY, mock.ANY, mock.ANY)
|
||||
|
||||
@mock.patch("docker.Client")
|
||||
@mock.patch("microservices.build.build_dockerfile")
|
||||
@mock.patch("microservices.build.submit_dockerfile_processing")
|
||||
@mock.patch("fuel_ccp.build.build_dockerfile")
|
||||
@mock.patch("fuel_ccp.build.submit_dockerfile_processing")
|
||||
def test_process_dockerfile_middle_keep_consistency_off(
|
||||
self, submit_dockerfile_processing_mock,
|
||||
build_dockerfile_mock, dc_mock):
|
|
@ -2,8 +2,8 @@ import mock
|
|||
from oslo_config import cfg
|
||||
import yaml
|
||||
|
||||
from microservices import deploy
|
||||
from microservices.tests import base
|
||||
from fuel_ccp import deploy
|
||||
from fuel_ccp.tests import base
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
@ -96,7 +96,7 @@ class TestDeployCreateService(base.TestCase):
|
|||
def setUp(self):
|
||||
super(TestDeployCreateService, self).setUp()
|
||||
self._create_obj = mock.patch(
|
||||
"microservices.kubernetes.create_object_from_definition")
|
||||
"fuel_ccp.kubernetes.create_object_from_definition")
|
||||
self.create_obj = self._create_obj.start()
|
||||
|
||||
def test_create_service_without_ports(self):
|
|
@ -4,8 +4,8 @@ import fixtures
|
|||
import mock
|
||||
from oslo_config import cfg
|
||||
|
||||
from microservices import fetch
|
||||
from microservices.tests import base
|
||||
from fuel_ccp import fetch
|
||||
from fuel_ccp.tests import base
|
||||
|
||||
|
||||
CONF = cfg.CONF
|
|
@ -2,8 +2,8 @@ import mock
|
|||
|
||||
from oslo_config import cfg
|
||||
|
||||
from microservices import kubernetes
|
||||
from microservices.tests import base
|
||||
from fuel_ccp import kubernetes
|
||||
from fuel_ccp.tests import base
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# 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.
|
||||
|
||||
"""
|
||||
test_microservices
|
||||
----------------------------------
|
||||
|
||||
Tests for `microservices` module.
|
||||
"""
|
||||
|
||||
from microservices.tests import base
|
||||
|
||||
|
||||
class TestMicroservices(base.TestCase):
|
||||
|
||||
def test_something(self):
|
||||
pass
|
18
setup.cfg
18
setup.cfg
|
@ -1,5 +1,5 @@
|
|||
[metadata]
|
||||
name = microservices
|
||||
name = fuel-ccp
|
||||
summary = Docker images builder for OpenStack services and infra.
|
||||
description-file =
|
||||
README.rst
|
||||
|
@ -21,11 +21,11 @@ classifier =
|
|||
|
||||
[files]
|
||||
packages =
|
||||
microservices
|
||||
fuel_ccp
|
||||
|
||||
[entry_points]
|
||||
console_scripts =
|
||||
mcp-microservices = microservices.cli:main
|
||||
mcp-microservices = fuel_ccp.cli:main
|
||||
|
||||
[build_sphinx]
|
||||
source-dir = doc/source
|
||||
|
@ -36,15 +36,15 @@ all_files = 1
|
|||
upload-dir = doc/build/html
|
||||
|
||||
[compile_catalog]
|
||||
directory = microservices/locale
|
||||
domain = microservices
|
||||
directory = fuel_ccp/locale
|
||||
domain = fuel-ccp
|
||||
|
||||
[update_catalog]
|
||||
domain = microservices
|
||||
output_dir = microservices/locale
|
||||
input_file = microservices/locale/microservices.pot
|
||||
domain = fuel-ccp
|
||||
output_dir = fuel_ccp/locale
|
||||
input_file = fuel_ccp/locale/microservices.pot
|
||||
|
||||
[extract_messages]
|
||||
keywords = _ gettext ngettext l_ lazy_gettext
|
||||
mapping_file = babel.cfg
|
||||
output_file = microservices/locale/microservices.pot
|
||||
output_file = fuel_ccp/locale/microservices.pot
|
||||
|
|
Loading…
Reference in New Issue