aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/metadata/service
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/metadata/service
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/metadata/service')
-rw-r--r--mcp/metadata/service/opendaylight/server/single.yml20
-rw-r--r--mcp/metadata/service/opendaylight/support.yml19
-rw-r--r--mcp/metadata/service/tacker/server/single.yml34
3 files changed, 0 insertions, 73 deletions
diff --git a/mcp/metadata/service/opendaylight/server/single.yml b/mcp/metadata/service/opendaylight/server/single.yml
deleted file mode 100644
index 3a762b39a..000000000
--- a/mcp/metadata/service/opendaylight/server/single.yml
+++ /dev/null
@@ -1,20 +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
-##############################################################################
----
-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/metadata/service/opendaylight/support.yml b/mcp/metadata/service/opendaylight/support.yml
deleted file mode 100644
index bbb204315..000000000
--- a/mcp/metadata/service/opendaylight/support.yml
+++ /dev/null
@@ -1,19 +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
-##############################################################################
----
-parameters:
- opendaylight:
- _support:
- collectd:
- enabled: false
- heka:
- enabled: false
- sensu:
- enabled: false
- sphinx:
- enabled: false
diff --git a/mcp/metadata/service/tacker/server/single.yml b/mcp/metadata/service/tacker/server/single.yml
deleted file mode 100644
index 597d9f8fb..000000000
--- a/mcp/metadata/service/tacker/server/single.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-##############################################################################
-# Copyright (c) 2018 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
-##############################################################################
----
-classes:
- - service.git.client
-parameters:
- _param:
- keystone_tacker_endpoint_type: internalURL
- tacker:
- server:
- bind_host: ${_param:cluster_local_address}
- enabled: true
- branch: stable/queens
- database:
- engine: mysql
- host: ${_param:single_address}
- port: 3306
- name: tacker
- user: tacker
- password: ${_param:mysql_tacker_password}
- identity:
- engine: keystone
- region: RegionOne
- host: ${_param:single_address}
- port: 35357
- user: tacker
- password: ${_param:keystone_tacker_password}
- tenant: service
- endpoint_type: ${_param:keystone_tacker_endpoint_type}