summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rw-r--r--deploy/cloud/configure_nodes.py19
-rw-r--r--deploy/cloud/deploy.py3
-rw-r--r--deploy/cloud/deployment.py5
-rw-r--r--deploy/common.py3
-rw-r--r--deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/plugins/fuel-congress_1.0.0.yaml49
-rw-r--r--deploy/deploy-config.py10
-rwxr-xr-xdeploy/deploy.py1
-rw-r--r--deploy/deploy_env.py1
-rw-r--r--deploy/dha_adapters/zte_adapter.py2
-rw-r--r--deploy/install_fuel_master.py1
-rw-r--r--deploy/scenario/ha_heat_ceilometer_scenario.yaml5
-rw-r--r--deploy/scenario/no-ha_heat_ceilometer_scenario.yaml5
16 files changed, 75 insertions, 41 deletions
diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py
index ea50307b1..eabec397c 100644
--- a/deploy/cloud/configure_nodes.py
+++ b/deploy/cloud/configure_nodes.py
@@ -8,7 +8,6 @@
###############################################################################
import copy
-import glob
import io
import six
@@ -143,7 +142,8 @@ class ConfigureNodes(object):
# ens5:
# - interface_properties:
# dpdk:
- # enabled: true
+ # enabled:
+ # value: true
# - private
# ens6:
# - public
@@ -170,19 +170,19 @@ class ConfigureNodes(object):
if interface['name'] in interface_config:
for prop in interface_config[interface['name']]:
net = {}
- #net name
+ # net name
if isinstance(prop, six.string_types):
net['id'] = net_name_id[prop]
net['name'] = prop
interface['assigned_networks'].append(net)
- #network properties
+ # network properties
elif isinstance(prop, dict):
- if not 'interface_properties' in prop:
- log('Interface configuration contain unknow dict: %s' % prop)
+ if 'interface_properties' not in prop:
+ log('Interface configuration contains unknown dict: %s' % prop)
continue
- interface['interface_properties'] = \
- self._merge_dicts(interface.get('interface_properties', {}),
- prop.get('interface_properties', {}))
+ interface['attributes'] = self._merge_dicts(
+ interface.get('attributes', {}),
+ prop.get('interface_properties', {}))
with io.open(interface_yaml, 'w') as stream:
yaml.dump(interfaces, stream, default_flow_style=False)
@@ -199,4 +199,3 @@ class ConfigureNodes(object):
continue
result[k] = copy.deepcopy(v)
return result
-
diff --git a/deploy/cloud/deploy.py b/deploy/cloud/deploy.py
index e00934bd9..dac2fe8dd 100644
--- a/deploy/cloud/deploy.py
+++ b/deploy/cloud/deploy.py
@@ -8,9 +8,6 @@
###############################################################################
-import yaml
-import io
-
from dea import DeploymentEnvironmentAdapter
from configure_environment import ConfigureEnvironment
from deployment import Deployment
diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py
index 5dd026318..28bcfdf1d 100644
--- a/deploy/cloud/deployment.py
+++ b/deploy/cloud/deployment.py
@@ -13,15 +13,10 @@ import json
from common import (
N,
- E,
exec_cmd,
- run_proc,
- run_proc_wait_terminated,
- run_proc_kill,
parse,
err,
log,
- delete,
)
SEARCH_TEXT = '(err)'
diff --git a/deploy/common.py b/deploy/common.py
index dab9602c5..b3d552415 100644
--- a/deploy/common.py
+++ b/deploy/common.py
@@ -15,7 +15,6 @@ import os
import logging
import argparse
import shutil
-import stat
import errno
import time
import shlex
@@ -126,7 +125,7 @@ def clean(lines):
return parsed if len(parsed_list) == 1 else parsed_list
-def err(message, fun = None, *args):
+def err(message, fun=None, *args):
LOG.error('%s\n' % message)
if fun:
fun(*args)
diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
index 32b2cfb22..852b363d4 100644
--- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
index cb80e3855..150d4ed06 100644
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
index 92cc0e616..be80b9724 100644
--- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
index ed7c63fac..35a2201cf 100644
--- a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/plugins/fuel-congress_1.0.0.yaml b/deploy/config/plugins/fuel-congress_1.0.0.yaml
new file mode 100644
index 000000000..c7ba8a138
--- /dev/null
+++ b/deploy/config/plugins/fuel-congress_1.0.0.yaml
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2016 Mirantis Inc and others.
+# fzhadaev@mirantis.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+plugin-config-metadata:
+ title: Congress fuel plugin configuration template
+ version: 0.1
+ created: 03.10.2016
+ comment: None
+congress:
+ metadata:
+ #chosen_id: Assigned during installation
+ class: plugin
+ default: false
+ enabled: true
+ label: Fuel Congress plugin
+ toggleable: true
+ versions:
+ - enabled:
+ description: Service enable state for congress-server
+ label: Enable
+ type: checkbox
+ value: true
+ weight: 25
+ metadata:
+ contains_legacy_tasks: false
+ db_password:
+ generator: 'password'
+ group: openstack_services
+ hot_pluggable: false
+ #plugin_id: Assigned during installation
+ plugin_version: 1.0.0
+ port: 1789
+ service: congress-server
+ user: congress
+ user_password:
+ generator: 'password'
+ policies:
+ description: Set of policies to configure for congress (in JSON format)
+ label: Policies
+ type: text
+ value: '{}'
+ weight: 50
+ weight: 70 \ No newline at end of file
diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py
index d2567d97b..5f5699cd7 100644
--- a/deploy/deploy-config.py
+++ b/deploy/deploy-config.py
@@ -31,17 +31,7 @@ import time
import collections
import hashlib
-from functools import reduce
-from operator import or_
from common import (
- log,
- exec_cmd,
- err,
- warn,
- check_file_exists,
- create_dir_if_not_exists,
- delete,
- check_if_root,
ArgParser,
)
diff --git a/deploy/deploy.py b/deploy/deploy.py
index f491929e0..057a0579c 100755
--- a/deploy/deploy.py
+++ b/deploy/deploy.py
@@ -14,7 +14,6 @@ import io
import re
import sys
import yaml
-import errno
import signal
import netaddr
diff --git a/deploy/deploy_env.py b/deploy/deploy_env.py
index 93dc3959b..8afaeb143 100644
--- a/deploy/deploy_env.py
+++ b/deploy/deploy_env.py
@@ -20,7 +20,6 @@ from ssh_client import SSHClient
from common import (
err,
log,
- exec_cmd,
parse,
N,
E,
diff --git a/deploy/dha_adapters/zte_adapter.py b/deploy/dha_adapters/zte_adapter.py
index da651ca15..5d7939aa2 100644
--- a/deploy/dha_adapters/zte_adapter.py
+++ b/deploy/dha_adapters/zte_adapter.py
@@ -8,13 +8,11 @@
###############################################################################
-import time
from ipmi_adapter import IpmiAdapter
from common import (
log,
exec_cmd,
- err,
)
diff --git a/deploy/install_fuel_master.py b/deploy/install_fuel_master.py
index a0e28b033..2da69e350 100644
--- a/deploy/install_fuel_master.py
+++ b/deploy/install_fuel_master.py
@@ -16,7 +16,6 @@ from dha_adapters.libvirt_adapter import LibvirtAdapter
from common import (
log,
err,
- clean,
delete,
)
diff --git a/deploy/scenario/ha_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
index 4051c478a..6b032bfdd 100644
--- a/deploy/scenario/ha_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_heat_ceilometer_scenario.yaml
@@ -32,6 +32,9 @@ deployment-scenario-metadata:
# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
# It does so by copying the config file to the local plugin config directory
stack-extensions:
+ - module: congress
+ module-config-name: fuel-congress
+ module-config-version: 1.0.0
##############################################################################
# By editing the override-config sections below, you can override arbitrary
@@ -40,7 +43,7 @@ dea-override-config:
nodes:
- id: 1
interfaces: interfaces_1
- role: controller
+ role: controller, congress
- id: 2
interfaces: interfaces_1
role: mongo, controller
diff --git a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
index 3dd5f841e..801b9fca7 100644
--- a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml
@@ -32,6 +32,9 @@ deployment-scenario-metadata:
# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
# It does so by copying the config file to the local plugin config directory
stack-extensions:
+ - module: congress
+ module-config-name: fuel-congress
+ module-config-version: 1.0.0
##############################################################################
# By editing the override-config sections below, you can override arbitrary
@@ -40,7 +43,7 @@ dea-override-config:
nodes:
- id: 1
interfaces: interfaces_1
- role: mongo,controller
+ role: mongo,controller,congress
- id: 2
interfaces: interfaces_1
role: ceph-osd,compute