diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-18 03:46:13 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-29 01:27:28 +0200 |
| commit | ab18375a629010525ac15bc11ce2d4e4cf393fe9 (patch) | |
| tree | 38dc93fe27b88db9ebe489e4c685b06e4b80561e /mcp/salt-formulas/salt-formula-opendaylight/metadata/service | |
| parent | cfa1c0d67ee23edcbc25d9620754159645981dd8 (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/salt-formula-opendaylight/metadata/service')
| -rw-r--r-- | mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml | 20 | ||||
| -rw-r--r-- | mcp/salt-formulas/salt-formula-opendaylight/metadata/service/support.yml | 19 |
2 files changed, 39 insertions, 0 deletions
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml new file mode 100644 index 000000000..3a762b39a --- /dev/null +++ b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml @@ -0,0 +1,20 @@ +############################################################################## +# 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 +############################################################################## +--- +applications: + - opendaylight +parameters: + _param: + version: oxygen + opendaylight: + server: + enabled: 'True' + version: ${_param:version} + repo: 'odl-team/${_param:version}' + logging: + engine: syslog diff --git a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/support.yml b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/support.yml new file mode 100644 index 000000000..bbb204315 --- /dev/null +++ b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/support.yml @@ -0,0 +1,19 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + opendaylight: + _support: + collectd: + enabled: false + heka: + enabled: false + sensu: + enabled: false + sphinx: + enabled: false |