aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/opendaylight/map.jinja
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-18 03:46:13 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-29 01:27:28 +0200
commitab18375a629010525ac15bc11ce2d4e4cf393fe9 (patch)
tree38dc93fe27b88db9ebe489e4c685b06e4b80561e /mcp/salt-formulas/opendaylight/map.jinja
parentcfa1c0d67ee23edcbc25d9620754159645981dd8 (diff)
[docker] Switch to containerized Salt Master
* Refactor OPNFV salt-formulas mechanism to resemble upstream git structure: - git submodules: add new submodule for each formula we patch; - create salt-formula-x directories for OPNFV formulas; - move mcp/metadata/service contents to their each formula subdir; - use `make patches-import` for patches previously handled by patch.sh; - retire patch.sh * states: add virtual_init: - mostly based on old salt.sh, which is now obsolete; - exclude salt-master service restart (it would kill the container); * scenarios: cleanup (rm cfg01 virtual node def), adopt virtual_init; * reclass: align our model with prebuilt container's Salt config: - drop linux:network pillar data (handled by Docker); - stop applying linux.system state on cfg01; - align salt user homedir; - drop salt-formula packages (preprovisioned); * minor plumbing in deploy.sh and lib.sh; JIRA: FUEL-383 Change-Id: I28708a9b399d3f19012212c71966ebda9d6fc0ac Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/salt-formulas/opendaylight/map.jinja')
-rw-r--r--mcp/salt-formulas/opendaylight/map.jinja28
1 files changed, 0 insertions, 28 deletions
diff --git a/mcp/salt-formulas/opendaylight/map.jinja b/mcp/salt-formulas/opendaylight/map.jinja
deleted file mode 100644
index 38575111e..000000000
--- a/mcp/salt-formulas/opendaylight/map.jinja
+++ /dev/null
@@ -1,28 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc. and others.
-# 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
-##############################################################################
-
-{% set server = salt['grains.filter_by']({
- 'Debian': {
- 'karaf_features': {'default': ['standard', 'wrap', 'ssh']},
- 'odl_rest_port': '8282',
- 'odl_bind_ip': '0.0.0.0',
- 'repo': 'odl-team/oxygen',
- 'log_levels': {},
- 'enable_ha': false,
- 'ha_node_ips': [],
- 'ha_node_index': 0,
- 'security_group_mode': 'stateful',
- 'vpp_routing_node': '',
- 'java_extra_opts': '-Djava.net.preferIPv4Stack=true -XX:+UseG1GC',
- 'java_min_mem': '1g',
- 'java_max_mem': '2g',
- },
- 'RedHat': {
- 'repo': 'opendaylight-6-testing'
- },
-}, merge=salt['pillar.get']('opendaylight:server')) %}