diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-26 05:27:51 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-26 16:11:11 +0000 |
| commit | 763cf5a07027d8c26b597a40051fd9af8fbe3f81 (patch) | |
| tree | 394f07dd7ca78a48d81bf23193dd1df57dbb1d8c /patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch | |
| parent | aff2252078c012c49e713f4dc025e7d911c944a0 (diff) | |
u/fuel: Bump & rebase for yamllint cleanup
Change-Id: I1144c523596feb64251f08375501cdb73a0d76f6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 6dcb09998dae3c3f2a55fc5169fe7dc9010f8a0f)
Diffstat (limited to 'patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch')
| -rw-r--r-- | patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch index 7766e323..1f937ca0 100644 --- a/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch @@ -21,10 +21,10 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index c4f59cc..7b3dacc 100755 +index 1adccbf..85d1a9e 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -81,6 +81,7 @@ salt -C 'mas01*' pillar.item\ +@@ -84,6 +84,7 @@ salt -C 'mas01*' pillar.item\ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all salt -C 'kvm*' pkg.install bridge-utils @@ -32,7 +32,7 @@ index c4f59cc..7b3dacc 100755 salt -C 'kvm*' state.apply linux.network salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 salt -C 'kvm*' system.reboot -@@ -105,6 +106,7 @@ while [ $rc -ne 0 ]; do +@@ -108,6 +109,7 @@ while [ $rc -ne 0 ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; @@ -41,13 +41,13 @@ index c4f59cc..7b3dacc 100755 sleep 5 done diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml -index 4cb4f2f..16cf4ec 100644 +index c9be2c2..5c84ec6 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml -@@ -1,3 +1,7 @@ +@@ -2,3 +2,7 @@ classes: - - cluster.all-mcp-ocata-common.opnfv.runtime - - cluster.all-mcp-ocata-common.opnfv.pod_config + - cluster.all-mcp-ocata-common.opnfv.runtime + - cluster.all-mcp-ocata-common.opnfv.pod_config +parameters: + _param: + opnfv_user_username: opnfv |