summaryrefslogtreecommitdiffstats
path: root/mcp/scripts/user-data.sh.j2
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-06-28 15:52:22 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-06-29 00:37:14 +0200
commit248b456255f831b27e458e2cd8bd0f449be11434 (patch)
treeaf2bfc3b83cf8eb534afd605af0bb51670c247d6 /mcp/scripts/user-data.sh.j2
parent5440500624a503b3f91852cd17089aab76afe806 (diff)
[virtual] Add Ubuntu 18.04 (Bionic) basic support
Support Ubuntu 18.04 for virtual deployments (and implicitly for VCP VMs). Note that MaaS-provisioned systems will require the same changes being applied via curtin templates. Change-Id: I7cbd7e7c4421f6b970ce6ef97c10d269fec5fca3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/scripts/user-data.sh.j2')
-rw-r--r--mcp/scripts/user-data.sh.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/mcp/scripts/user-data.sh.j2 b/mcp/scripts/user-data.sh.j2
index f568164c1..8b80e32d0 100644
--- a/mcp/scripts/user-data.sh.j2
+++ b/mcp/scripts/user-data.sh.j2
@@ -11,5 +11,10 @@ rm -f /etc/salt/minion_id /etc/salt/pki/minion/minion_master.pub
echo "id: $(hostname).{{ conf.cluster.domain }}" > /etc/salt/minion
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
ldconfig
+{%- if 'ubuntu1804' in conf.MCP_OS %}
+systemctl unmask networking.service || true
+systemctl enable networking.service || true
+systemctl start networking.service || true
+{%- endif %}
systemctl enable salt-minion.service
systemctl restart salt-minion.service