1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2017 Enea AB and others.
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Charalampos Kominos <Charalampos.Kominos@enea.com>
10 Date: Fri, 1 Sep 2017 12:24:35 +0200
11 Subject: [PATCH] Add opnfv user to the deployment
13 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
14 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
15 Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
17 mcp/config/states/baremetal_init | 1 +
18 mcp/config/states/virtual_control_plane | 1 +
19 mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml | 4 ++++
20 mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++
21 4 files changed, 13 insertions(+)
22 create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
24 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
25 index 67022b0..5943e03 100755
26 --- a/mcp/config/states/baremetal_init
27 +++ b/mcp/config/states/baremetal_init
28 @@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
29 repl="\n if not __salt__['pkg.version']('vlan'):\n __salt__['pkg.install']('vlan')"
31 salt -C 'kvm*' pkg.install bridge-utils
32 +salt -C 'kvm* or cmp*' state.apply opnfv.adduser
33 salt -C 'kvm*' state.apply linux.network
34 salt -C 'cmp*' state.apply linux.system
35 salt -C 'cmp*' state.apply linux.network || true
36 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
37 index 1cfcacd..58a1843 100755
38 --- a/mcp/config/states/virtual_control_plane
39 +++ b/mcp/config/states/virtual_control_plane
40 @@ -47,6 +47,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
42 for node in $vcp_nodes; do
43 salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
44 + salt -C "$node" state.apply opnfv.adduser
48 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
49 index f09ee5d..39d550a 100644
50 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
51 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
54 - cluster.all-mcp-arch-common.arch
55 - cluster.all-mcp-arch-common.opnfv
58 + opnfv_user_username: opnfv
59 + opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1
60 diff --git a/mcp/salt-formulas/opnfv/adduser.sls b/mcp/salt-formulas/opnfv/adduser.sls
62 index 0000000..78ef993
64 +++ b/mcp/salt-formulas/opnfv/adduser.sls
68 + - name: {{ salt['pillar.get']('_param:opnfv_user_username') }}
69 + - password: {{ salt['pillar.get']('_param:opnfv_user_password') }}