x/fuel-ccp
Code Issues Proposed changes

Renaming all "mcp" occurrences to "ccp"

Browse Source 
Change-Id: Ic5bc5295330450bc925ad01ff204e897118fb881
This commit is contained in:
Andrey Pavlov 2016-08-29 11:46:44 +03:00
parent d844412b82
commit b282b4d3ca
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuel_ccp/config/cli.py
View File

@ -8,12 +8,12 @@ def add_parsers(subparsers):
build_action = subparsers.add_parser('build') build_action = subparsers.add_parser('build')
build_action.add_argument('-c', '--components', build_action.add_argument('-c', '--components',
nargs='+', nargs='+',
help='MCP component to build') help='CCP component to build')
deploy_action = subparsers.add_parser('deploy') deploy_action = subparsers.add_parser('deploy')
deploy_action.add_argument('-c', '--components', deploy_action.add_argument('-c', '--components',
nargs='+', nargs='+',
help='MCP component to deploy') help='CCP component to deploy')
deploy_action.add_argument("--dry-run", deploy_action.add_argument("--dry-run",
action='store_true', action='store_true',
help="Print k8s objects definitions without" help="Print k8s objects definitions without"

4
fuel_ccp/kubernetes.py
View File

@ -97,7 +97,7 @@ def list_cluster_daemonsets():
api = apisextensionsvbeta_api.ApisextensionsvbetaApi(client) api = apisextensionsvbeta_api.ApisextensionsvbetaApi(client)
return api.list_namespaced_daemon_set( return api.list_namespaced_daemon_set(
namespace=CONF.kubernetes.namespace, namespace=CONF.kubernetes.namespace,
label_selector="mcp=true").items label_selector="ccp=true").items
def list_cluster_deployments(): def list_cluster_deployments():
@ -105,7 +105,7 @@ def list_cluster_deployments():
api = apisextensionsvbeta_api.ApisextensionsvbetaApi(client) api = apisextensionsvbeta_api.ApisextensionsvbetaApi(client)
return api.list_namespaced_deployment( return api.list_namespaced_deployment(
namespace=CONF.kubernetes.namespace, namespace=CONF.kubernetes.namespace,
label_selector="mcp=true").items label_selector="ccp=true").items
def get_object_names(items): def get_object_names(items):

22
fuel_ccp/templates.py
View File

@ -15,7 +15,7 @@ FILES_CONFIG = "files"
META_CONFIG = "meta" META_CONFIG = "meta"
ROLE_CONFIG = "role" ROLE_CONFIG = "role"
ENTRYPOINT_PATH = "/opt/mcp_start_script/bin/start_script.py" ENTRYPOINT_PATH = "/opt/ccp_start_script/bin/start_script.py"
def _get_image_name(image_name): def _get_image_name(image_name):
@ -41,7 +41,7 @@ def serialize_configmap(name, data):
"metadata": { "metadata": {
"name": name, "name": name,
"labels": { "labels": {
"mcp": "true" "ccp": "true"
} }
}, },
"data": data "data": data
@ -52,23 +52,23 @@ def serialize_volume_mounts(container):
spec = [ spec = [
{ {
"name": GLOBAL_CONFIG, "name": GLOBAL_CONFIG,
"mountPath": "/etc/mcp/%s" % GLOBAL_CONFIG "mountPath": "/etc/ccp/%s" % GLOBAL_CONFIG
}, },
{ {
"name": ROLE_CONFIG, "name": ROLE_CONFIG,
"mountPath": "/etc/mcp/%s" % ROLE_CONFIG "mountPath": "/etc/ccp/%s" % ROLE_CONFIG
}, },
{ {
"name": META_CONFIG, "name": META_CONFIG,
"mountPath": "/etc/mcp/%s" % META_CONFIG "mountPath": "/etc/ccp/%s" % META_CONFIG
}, },
{ {
"name": SCRIPT_CONFIG, "name": SCRIPT_CONFIG,
"mountPath": "/opt/mcp_start_script/bin" "mountPath": "/opt/ccp_start_script/bin"
}, },
{ {
"name": FILES_CONFIG, "name": FILES_CONFIG,
"mountPath": "/etc/mcp/%s" % FILES_CONFIG "mountPath": "/etc/ccp/%s" % FILES_CONFIG
} }
] ]
for v in container.get("volumes", ()): for v in container.get("volumes", ()):
@ -240,7 +240,7 @@ def serialize_job(name, spec):
"metadata": { "metadata": {
"name": name, "name": name,
"labels": { "labels": {
"mcp": "true" "ccp": "true"
} }
}, },
"spec": { "spec": {
@ -262,7 +262,7 @@ def serialize_deployment(name, spec, affinity):
"metadata": { "metadata": {
"annotations": affinity, "annotations": affinity,
"labels": { "labels": {
"mcp": "true", "ccp": "true",
"app": name "app": name
} }
}, },
@ -284,7 +284,7 @@ def serialize_daemonset(name, spec, affinity):
"metadata": { "metadata": {
"annotations": affinity, "annotations": affinity,
"labels": { "labels": {
"mcp": "true", "ccp": "true",
"app": name "app": name
} }
}, },
@ -327,7 +327,7 @@ def serialize_service(name, ports):
"metadata": { "metadata": {
"name": name, "name": name,
"labels": { "labels": {
"mcp": "true" "ccp": "true"
} }
}, },
"spec": { "spec": {

2
fuel_ccp/tests/test_deploy.py
View File

@ -177,7 +177,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
mcp: "true" ccp: "true"
name: foo name: foo
spec: spec:
ports: ports: