X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=patches%2Fopnfv-fuel%2F0004-Add-opnfv-user-to-the-deployment.patch;fp=patches%2Fopnfv-fuel%2F0004-Add-opnfv-user-to-the-deployment.patch;h=0000000000000000000000000000000000000000;hb=73161ee4be1766447a1f54e122f857caef307c8a;hp=c8c7fe846d217147e0162d655ab118a4a92a82d7;hpb=d6ff3a19ef707db95e38589598c5fcbc194d6032;p=armband.git

diff --git a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch
deleted file mode 100644
index c8c7fe84..00000000
--- a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Charalampos Kominos <Charalampos.Kominos@enea.com>
-Date: Fri, 1 Sep 2017 12:24:35 +0200
-Subject: [PATCH] Add opnfv user to the deployment
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
-Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
----
- mcp/config/states/baremetal_init                            | 1 +
- mcp/config/states/virtual_control_plane                     | 1 +
- mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 | 3 +++
- mcp/salt-formulas/opnfv/adduser.sls                         | 7 +++++++
- 4 files changed, 12 insertions(+)
- create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
-
-diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 14d6a570..1317900a 100755
---- a/mcp/config/states/baremetal_init
-+++ b/mcp/config/states/baremetal_init
-@@ -27,6 +27,7 @@ salt -C "${cluster_nodes_query}" file.replace $debian_ip_source \
-   repl="\n        if not __salt__['pkg.version']('vlan'):\n            __salt__['pkg.install']('vlan')"
-
- salt -C "${cluster_nodes_query}" pkg.install bridge-utils
-+salt -C "${control_nodes_query}" state.apply opnfv.adduser
- salt -C "${control_nodes_query}" state.apply linux.network,linux.system.kernel
- wait_for 5.0 "salt -C '${cluster_nodes_query}' state.apply salt.minion"
- wait_for 5.0 "salt -C '${compute_nodes_query}' state.apply linux.system,linux.network"
-diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index f8ef86b3..40849e66 100755
---- a/mcp/config/states/virtual_control_plane
-+++ b/mcp/config/states/virtual_control_plane
-@@ -39,6 +39,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no
- # Check all vcp nodes are available
- wait_for 25.0 "(for n in ${vcp_nodes}; do salt \${n} test.ping 2>/dev/null || exit; done)"
-
-+wait_for 5.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply opnfv.adduser"
- wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
-
- # Propagate APT proxy config created by curtin on baremetal nodes to VCP VMs
-diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
-index 15fbf285..51edd16e 100644
---- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
-+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
-@@ -15,6 +15,9 @@ parameters:
-
-     banner_company_name: OPNFV
-
-+    opnfv_user_username: opnfv
-+    opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1
-+
-     salt_control_trusty_image: ''  # Dummy value, to keep reclass 1.5.2 happy
-     salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img
-
-diff --git a/mcp/salt-formulas/opnfv/adduser.sls b/mcp/salt-formulas/opnfv/adduser.sls
-new file mode 100644
-index 00000000..78ef993d
---- /dev/null
-+++ b/mcp/salt-formulas/opnfv/adduser.sls
-@@ -0,0 +1,7 @@
-+add_opnfv_user:
-+  user.present:
-+  - name: {{ salt['pillar.get']('_param:opnfv_user_username') }}
-+  - password: {{ salt['pillar.get']('_param:opnfv_user_password') }}
-+  - createhome: True
-+  - groups:
-+    - sudo