From cfa1c0d67ee23edcbc25d9620754159645981dd8 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 10 Aug 2018 16:52:43 +0200 Subject: [docker] Add docker-compose definitions Add configuration items for bringing up the Salt master Docker container using docker-compose: - mount /hosts as /etc/hosts - mount /salt as /etc/salt: * semi-persistent generated Salt information; - mount /nodes as /srv/salt/reclass/nodes: * semi-persistent generated reclass node data storage; - mount Fuel@OPNFV git repo in /root/fuel; - mount all other previously rsynced artifacts; - hook container to 3 networks/bridges: mcpcontrol, PXE/admin and management: * container IP addresses are managed by Docker, so no DHCP is used; - override upstream entrypoint.sh by mounting our own version on top; * run-time patch Salt to fix certain init system interactions due to 'Tini' looking like Upstart but behaving a bit differently; * work around directory traversal issues in Salt/reclass by using extensive `cp` (to be later mitigated at container build time); * overwrite reclass.system with our own version (patched), later to fetched pre-patched during container build; * overwrite salt-formulas with our patched versions; * create missing links for salt-formulas-* packages (e.g. gnocchi) which are not available as git repos upstream; - add mcp.rsa.pub to 'ubuntu' user's authorized_keys for SSH login to master node to remain backwards compatible; - mount configuration files for semi-persistent state preservation at container destroy/rebuild (using '-f' deploy argument); JIRA: FUEL-383 Change-Id: Ie17e578a7ebeb071b1c0e0a49ad58ffa6bbc89bb Signed-off-by: Alexandru Avadanii --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index fe7a86422..f6e77140a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,5 +12,5 @@ **/mcp/deploy/images/ **/mcp/scripts/user-data.sh **/mcp/scripts/virsh_net/*.xml +**/mcp/scripts/docker-compose/*.yaml **/mcp/scripts/*.img -**/net_map.j2 -- cgit 1.2.3-korg