From b666bc50b2b8b1bb8cde5cdab280f0409bde4958 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 11 Sep 2018 06:59:03 +0200 Subject: [cleanup] FN VMs: Fold user-data templates While at it, retire obsolete MAAS_IP global variable and let mas01 VM get a DHCP address from virsh-managed mcpcontrol network. Change-Id: Ifd85dbcab10894a5d0d675d37f0c35f09776d9b4 Signed-off-by: Alexandru Avadanii --- mcp/scripts/user-data.mcp.sh.j2 | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 mcp/scripts/user-data.mcp.sh.j2 (limited to 'mcp/scripts/user-data.mcp.sh.j2') diff --git a/mcp/scripts/user-data.mcp.sh.j2 b/mcp/scripts/user-data.mcp.sh.j2 deleted file mode 100644 index bd80961e6..000000000 --- a/mcp/scripts/user-data.mcp.sh.j2 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB 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 -############################################################################## -rm /etc/salt/minion_id -rm -f /etc/salt/pki/minion/minion_master.pub -echo "id: $(hostname).{{ conf.cluster.domain }}" > /etc/salt/minion -echo "master: {{ conf.SALT_MASTER }}" >> /etc/salt/minion -service salt-minion restart -- cgit 1.2.3-korg