diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-07 23:02:40 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-08 00:46:42 +0100 |
| commit | 057a69974a433b4cac6ed51a92b95ffc4517edf5 (patch) | |
| tree | d00288a3557d7d6f1a18bbdcd842f0b4d400a6d7 /patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch | |
| parent | 823f3774a579a8dd21bf6a76c61eea1049bf9ebc (diff) | |
u/fuel: Bump & rebase for net_config ip-range
JIRA: FUEL-351
Change-Id: I7b893e9d94eaf9e34daee3bf4442229be964c294
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch')
| -rw-r--r-- | patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch index 37638387..d9577cdd 100644 --- a/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0011-Add-opnfv-user-to-the-deployment.patch @@ -22,7 +22,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index 9bfe535..82649df 100755 +index 0c41557d..799a9419 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 9bfe535..82649df 100755 salt -C 'kvm* or cmp*' state.apply salt.minion salt -C 'cmp*' state.apply linux.system diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index afdfb4f..0c0d69c 100755 +index 144245f9..8ea75f17 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 @@ -46,7 +46,7 @@ index afdfb4f..0c0d69c 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 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml -index f9aeb71..21a5de4 100644 +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 @@ @@ -59,7 +59,7 @@ index f9aeb71..21a5de4 100644 + opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1 diff --git a/mcp/salt-formulas/opnfv/adduser.sls b/mcp/salt-formulas/opnfv/adduser.sls new file mode 100644 -index 0000000..78ef993 +index 00000000..78ef993d --- /dev/null +++ b/mcp/salt-formulas/opnfv/adduser.sls @@ -0,0 +1,7 @@ |