diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-19 15:56:28 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-19 22:25:59 +0200 |
| commit | 18df834544a05cc4f49f6cc1acb896b804be6b23 (patch) | |
| tree | ddff308f8dcef116eb5e0819dd529acca192d380 /patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch | |
| parent | f95ed1cc9e24fc0eeae122d68ae9b4f563d64acb (diff) | |
u/fuel: Bump & rebase for static PXE/admin IPs
Change-Id: Ic86aad4afb74f6254ae8362db03a88e5e8cf967a
Diffstat (limited to 'patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch')
| -rw-r--r-- | patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch index 72c04ee4..f158ed40 100644 --- a/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch @@ -14,15 +14,15 @@ 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 | 4 ++++ - mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ - 4 files changed, 13 insertions(+) + mcp/config/states/baremetal_init | 1 + + mcp/config/states/virtual_control_plane | 1 + + .../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 5a1e9ab7..9fa5d5a7 100755 +index 6f935445..f685ab87 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ @@ -34,7 +34,7 @@ index 5a1e9ab7..9fa5d5a7 100755 wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply salt.minion" wait_for 5.0 "salt -C 'cmp*' state.apply linux.system" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 02a813c9..a179b22c 100755 +index 64d73953..d8c4e776 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 @@ -45,18 +45,20 @@ index 02a813c9..a179b22c 100755 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 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml -index f9aeb71a..21a5de4e 100644 ---- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml -+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml -@@ -9,3 +9,7 @@ - classes: - - cluster.all-mcp-arch-common.arch +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 19475c71..1a3c84fc 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 +@@ -10,6 +10,9 @@ classes: - cluster.all-mcp-arch-common.opnfv -+parameters: -+ _param: + parameters: + _param: + 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 |