diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-02-19 15:17:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-02-19 15:17:25 +0000 |
| commit | 3c34bab9279d5dbe7df3824131e4487e5017ef15 (patch) | |
| tree | 2764cdfd7b9c8d597713d90b7958c6f4bbff8bf0 /mcp/scripts/user-data.sh.j2 | |
| parent | 1b2958b0695ebc9e2ba95f782b854540cea42c14 (diff) | |
| parent | 58af9a94ef78bbcf3f0593d4170d32ebce721455 (diff) | |
Merge "[baremetal] Containerize MaaS"
Diffstat (limited to 'mcp/scripts/user-data.sh.j2')
| -rw-r--r-- | mcp/scripts/user-data.sh.j2 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mcp/scripts/user-data.sh.j2 b/mcp/scripts/user-data.sh.j2 index cebf3bc61..d77773260 100644 --- a/mcp/scripts/user-data.sh.j2 +++ b/mcp/scripts/user-data.sh.j2 @@ -7,13 +7,8 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## {%- import 'net_map.j2' as nm with context %} -{%- set infra_nodes = conf[conf.MCP_JUMP_ARCH].default.virtual.nodes.infra %} rm /etc/salt/minion_id rm -f /etc/salt/pki/minion/minion_master.pub echo "id: $(hostname).{{ conf.cluster.domain }}" > /etc/salt/minion -if [[ "{{ infra_nodes or [] | join(' ') }}" =~ $(hostname) ]]; then - echo "master: {{ conf.SALT_MASTER }}" >> /etc/salt/minion -else - echo "master: {{ nm.net_admin | ipnet_hostaddr(nm.start_ip[nm.net_admin] + nm.net_admin_hosts.index('opnfv_infra_config_pxe_admin_address') +1) }}" >> /etc/salt/minion -fi +echo "master: {{ nm.net_admin | ipnet_hostaddr(nm.start_ip[nm.net_admin] + nm.net_admin_hosts.index('opnfv_infra_config_pxe_admin_address') +1) }}" >> /etc/salt/minion service salt-minion restart |