patches/opnfv-fuel/0020-Add-opnfv-user-to-the-deployment.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2017 Enea AB and others.
   3 :
   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
  12
  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>
  16 ---
  17  mcp/config/states/maas                                             | 2 ++
  18  mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/opnfv.yml   | 4 ++++
  19  .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml      | 1 +
  20  .../classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml      | 1 +
  21  mcp/salt-formulas/opnfv/adduser.sls                                | 7 +++++++
  22  5 files changed, 15 insertions(+)
  23  create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/opnfv.yml
  24  create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
  25
  26 diff --git a/mcp/config/states/maas b/mcp/config/states/maas
  27 index c54225d..6bd0aef 100755
  28 --- a/mcp/config/states/maas
  29 +++ b/mcp/config/states/maas
  30 @@ -75,6 +75,7 @@ salt -C 'mas01*' pillar.item\
  31  salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
  32
  33  salt -C 'kvm*' pkg.install bridge-utils
  34 +salt -C '*' state.apply opnfv.adduser
  35  salt -C 'kvm*' state.apply linux.network
  36  salt -C 'kvm*' state.apply armband.bootstrap_script_arm64
  37  salt -C 'kvm*' system.reboot
  38 @@ -98,6 +99,7 @@ while [ $rc -ne 0 ]; do
  39    rc=0
  40    for node in $vcp_nodes; do
  41      salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
  42 +    salt -C "$node" state.apply opnfv.adduser
  43    done
  44    sleep 5
  45  done
  46 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/opnfv.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/opnfv.yml
  47 new file mode 100644
  48 index 0000000..4cea805
  49 --- /dev/null
  50 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/opnfv.yml
  51 @@ -0,0 +1,4 @@
  52 +parameters:
  53 +  _param:
  54 +    opnfv_user_username: opnfv
  55 +    opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1
  56 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  57 index 79a8e92..fd615e4 100644
  58 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  59 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  60 @@ -1,4 +1,5 @@
  61  classes:
  62 +- cluster.baremetal-mcp-ocata-common.opnfv
  63  - system.linux.system.single
  64  - cluster.baremetal-mcp-ocata-odl-ha.openstack
  65  # - cluster.baremetal-mcp-ocata-odl-ha.stacklight
  66 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
  67 index d09c643..f7789c6 100644
  68 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
  69 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
  70 @@ -1,4 +1,5 @@
  71  classes:
  72 +- cluster.baremetal-mcp-ocata-common.opnfv
  73  - system.linux.system.single
  74  - cluster.baremetal-mcp-ocata-ovs-ha.openstack
  75  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight
  76 diff --git a/mcp/salt-formulas/opnfv/adduser.sls b/mcp/salt-formulas/opnfv/adduser.sls
  77 new file mode 100644
  78 index 0000000..78ef993
  79 --- /dev/null
  80 +++ b/mcp/salt-formulas/opnfv/adduser.sls
  81 @@ -0,0 +1,7 @@
  82 +add_opnfv_user:
  83 +  user.present:
  84 +  - name: {{ salt['pillar.get']('_param:opnfv_user_username') }}
  85 +  - password: {{ salt['pillar.get']('_param:opnfv_user_password') }}
  86 +  - createhome: True
  87 +  - groups:
  88 +    - sudo