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/tacker/files | |
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/tacker/files')
-rw-r--r-- | mcp/salt-formulas/tacker/files/tacker.conf | 45 | ||||
-rw-r--r-- | mcp/salt-formulas/tacker/files/tacker.systemd | 20 |
2 files changed, 0 insertions, 65 deletions
diff --git a/mcp/salt-formulas/tacker/files/tacker.conf b/mcp/salt-formulas/tacker/files/tacker.conf deleted file mode 100644 index 7adfd3139..000000000 --- a/mcp/salt-formulas/tacker/files/tacker.conf +++ /dev/null @@ -1,45 +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 -############################################################################## -{%- from "tacker/map.jinja" import server with context %} - -[DEFAULT] -auth_strategy = keystone -policy_file = /usr/local/etc/tacker/policy.json -debug = True -use_syslog = False -bind_host = {{ server.bind_host }} -bind_port = 9890 -service_plugins = nfvo,vnfm - -state_path = /var/lib/tacker - -[nfvo_vim] -vim_drivers = openstack - -[keystone_authtoken] -region_name = {{ server.identity.region }} -auth_type = password -user_domain_id = {{ server.identity.get('domain', 'default') }} -project_domain_id = {{ server.identity.get('domain', 'default') }} -project_name = {{ server.identity.tenant }} -username = {{ server.identity.user }} -password = {{ server.identity.password }} -auth_url = http://{{ server.identity.host }}:35357 -www_authenticate_uri = http://{{ server.identity.host }}:5000 -{%- if server.cache is defined %} -memcached_servers={%- for member in server.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %} -{%- endif %} - -[agent] -root_helper = sudo /usr/local/bin/tacker-rootwrap /usr/local/etc/tacker/rootwrap.conf - -[database] -connection = {{ server.database.engine }}+pymysql://{{ server.database.user }}:{{ server.database.password }}@{{ server.database.host }}/{{ server.database.name }}?charset=utf8 - -[tacker] -monitor_driver = ping,http_ping diff --git a/mcp/salt-formulas/tacker/files/tacker.systemd b/mcp/salt-formulas/tacker/files/tacker.systemd deleted file mode 100644 index 12ff5cdde..000000000 --- a/mcp/salt-formulas/tacker/files/tacker.systemd +++ /dev/null @@ -1,20 +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 -############################################################################## -[Unit] -Description = OpenStack Tacker service - -[Service] -ExecReload = /bin/kill -HUP $MAINPID -TimeoutStopSec = 300 -KillMode = process -WorkingDirectory = /tmp -ExecStartPre=/bin/mkdir -p /var/log/tacker -ExecStart=/usr/local/bin/tacker-server --config-file /usr/local/etc/tacker/tacker.conf --log-file /var/log/tacker/tacker.log - -[Install] -WantedBy = multi-user.target |