p/fuel: Retire OPNFV user

Now that networking configuration is stable and we rarely run into
serial-only access situations, it is safe to retire the OPNFV user.

While at it, bump Fuel@OPNFV git submodule to pick up minor updates.

Change-Id: I233e054795592700b7ec7e7031e1c2c9b8cc3450
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
index abf5f7a..0c9bb2c 100644 (file)
--- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
@@ -24,15 +24,15 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/openstack_ha                     |  1 +
- mcp/config/states/openstack_noha                   |  2 ++
- mcp/config/states/virtual_control_plane            |  1 +
- .../armband/files/nova-libvirt-aarch64-rollup.diff | 27 +++++++++++++++++
- mcp/salt-formulas/armband/init.sls                 |  7 +++++
- mcp/salt-formulas/armband/nova_config.sls          | 35 ++++++++++++++++++++++
- mcp/salt-formulas/armband/nova_libvirt.sls         |  7 +++++
- mcp/salt-formulas/armband/qemu_efi.sls             |  2 ++
- mcp/salt-formulas/armband/vgabios.sls              |  7 +++++
+ mcp/config/states/openstack_ha                |  1 +
+ mcp/config/states/openstack_noha              |  2 ++
+ mcp/config/states/virtual_control_plane       |  1 +
+ .../files/nova-libvirt-aarch64-rollup.diff    | 27 ++++++++++++++
+ mcp/salt-formulas/armband/init.sls            |  7 ++++
+ mcp/salt-formulas/armband/nova_config.sls     | 35 +++++++++++++++++++
+ mcp/salt-formulas/armband/nova_libvirt.sls    |  7 ++++
+ mcp/salt-formulas/armband/qemu_efi.sls        |  2 ++
+ mcp/salt-formulas/armband/vgabios.sls         |  7 ++++
  9 files changed, 89 insertions(+)
  create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
  create mode 100644 mcp/salt-formulas/armband/init.sls

diff --git a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 84e6cc4..998a5ab 100644 (file)
--- a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -33,9 +33,9 @@ to pick up the changes, so we'll run it before rebooting kvm nodes.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- mcp/config/states/baremetal_init                   |  1 +
- .../armband/files/salt-minion-aarch64-rollup.diff  | 70 ++++++++++++++++++++++
- mcp/salt-formulas/armband/salt_minion.sls          |  7 +++
+ mcp/config/states/baremetal_init              |  1 +
+ .../files/salt-minion-aarch64-rollup.diff     | 70 +++++++++++++++++++
+ mcp/salt-formulas/armband/salt_minion.sls     |  7 ++
  3 files changed, 78 insertions(+)
  create mode 100644 mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff
  create mode 100644 mcp/salt-formulas/armband/salt_minion.sls

diff --git a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
index a701421..75c5ae9 100644 (file)
--- a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -23,11 +23,11 @@ specific values.
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- .../0103-virtng-module-Extend-libvirt_domain.patch | 54 ++++++++++++++++++++++
- ...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++
- mcp/patches/patches.list                           |  2 +
- .../classes/cluster/mcp-common-ha/infra/kvm.yml    | 15 ++++++
- .../classes/cluster/mcp-odl-ha/infra/kvm.yml.j2    |  3 ++
+ ...-virtng-module-Extend-libvirt_domain.patch | 54 +++++++++++++++++++
+ ...t-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++
+ mcp/patches/patches.list                      |  2 +
+ .../cluster/mcp-common-ha/infra/kvm.yml.j2    | 15 ++++++
+ .../cluster/mcp-odl-ha/infra/kvm.yml.j2       |  3 ++
  5 files changed, 125 insertions(+)
  create mode 100644 mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch
  create mode 100644 mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch
@@ -159,10 +159,10 @@ index baa15d79..c9dbe24a 100644
  /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
 +/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
 +/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
-diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml
+diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
 index 62af0893..bda52803 100644
---- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml
+--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
++++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
 @@ -52,21 +52,33 @@ parameters:
          openstack.control:
            cpu: 4

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 (file)
index c8c7fe8..0000000
--- 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

diff --git a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0004-Set-volume-name-in-source-file-to-sdX.patch
similarity index 90%
rename from patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
rename to patches/opnfv-fuel/0004-Set-volume-name-in-source-file-to-sdX.patch
index 27a92ff..7bb2996 100644 (file)
--- a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0004-Set-volume-name-in-source-file-to-sdX.patch
@@ -12,8 +12,8 @@ Subject: [PATCH] Set volume name in source file to sdX
 
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 ---
- mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 2 +-
- mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml  | 2 +-
+ .../classes/cluster/mcp-common-ha/openstack_control.yml.j2      | 2 +-
+ .../classes/cluster/mcp-common-noha/openstack_control.yml       | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -30,7 +30,7 @@ index a7e8fcde..81a8a2af 100644
      server:
        <<: *db_conn_recycle_time
 diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
-index 48f99ca5..bcc6695c 100644
+index dbd9d055..3631e6ab 100644
 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
 @@ -80,7 +80,7 @@ parameters:

diff --git a/upstream/fuel b/upstream/fuel
index aac1f87..0f9744c 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit aac1f872a3cbe8d55d80a242bb0cab144ab58a4e
+Subproject commit 0f9744c1fd97bfd102d14104516059b17190b288