diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-07 16:36:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-07 16:36:11 +0000 |
| commit | 6da4060d054c66f3d0c17cfa885f6bfe171c5121 (patch) | |
| tree | 4adfeae072956db27e8e8c1475160a85e526ffa1 /mcp/scripts/user-data.mcp.sh.j2 | |
| parent | 5f0ac8951f2630642f05dd6d06c414a9402db954 (diff) | |
| parent | 256e2a50b9b340bb78a8c85fdd7cacf96d0fb637 (diff) | |
Merge "[vnode parsing] Move core logic to j2"
Diffstat (limited to 'mcp/scripts/user-data.mcp.sh.j2')
| -rw-r--r-- | mcp/scripts/user-data.mcp.sh.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/scripts/user-data.mcp.sh.j2 b/mcp/scripts/user-data.mcp.sh.j2 index 4bd0d1d09..bd80961e6 100644 --- a/mcp/scripts/user-data.mcp.sh.j2 +++ b/mcp/scripts/user-data.mcp.sh.j2 @@ -1,6 +1,6 @@ #!/bin/bash ############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# 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 @@ -8,6 +8,6 @@ ############################################################################## rm /etc/salt/minion_id rm -f /etc/salt/pki/minion/minion_master.pub -echo "id: $(hostname).{{ conf.CLUSTER_DOMAIN }}" > /etc/salt/minion +echo "id: $(hostname).{{ conf.cluster.domain }}" > /etc/salt/minion echo "master: {{ conf.SALT_MASTER }}" >> /etc/salt/minion service salt-minion restart |