diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-01 23:04:59 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-18 01:34:53 +0200 |
| commit | b9af498cb689f2018442461834c6f4013158500a (patch) | |
| tree | 09b13381e17ea78194997b7d71fd125f2d8f197c /patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch | |
| parent | 93f88afd749e2ce7a0e891c80e8dff276993f950 (diff) | |
p/fuel: Drop obsolete bootstrap-salt.sh workarounds
JIRA: ARMBAND-399
[1] https://github.com/saltstack/salt-bootstrap/pull/1251
Change-Id: Id3dccf6ae85e105f5e03eae69028da772954318c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch')
| -rw-r--r-- | patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 index b6194695..a3e66370 100644 --- a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch @@ -46,12 +46,12 @@ index f8ef86b3..40849e66 100755 # 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 fb1dcacd..530f85e1 100644 +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 -@@ -13,6 +13,9 @@ parameters: - _param: - openstack_version: queens +@@ -15,6 +15,9 @@ parameters: + + banner_company_name: OPNFV + opnfv_user_username: opnfv + opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1 |