From 397cd1932fae59622f3cc2d782faf68b803f4860 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 19 Sep 2017 16:36:43 +0200 Subject: u/fuel: Bump & rebase for PDF-compatible reclass JIRA: ARMBAND-292 Change-Id: I913ac6ec20cd34573c0e91989d7fd49a79abafaa Signed-off-by: Alexandru Avadanii --- .../opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'patches/opnfv-fuel/0017-Add-opnfv-user-to-the-deployment.patch') 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 4411df27..7766e323 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 create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 3aafaf5..546a53f 100755 +index c4f59cc..7b3dacc 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -79,6 +79,7 @@ salt -C 'mas01*' pillar.item\ +@@ -81,6 +81,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 3aafaf5..546a53f 100755 salt -C 'kvm*' state.apply linux.network salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 salt -C 'kvm*' system.reboot -@@ -102,6 +103,7 @@ while [ $rc -ne 0 ]; do +@@ -105,6 +106,7 @@ while [ $rc -ne 0 ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; @@ -41,12 +41,13 @@ index 3aafaf5..546a53f 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 28619ba..fd96969 100644 +index 4cb4f2f..16cf4ec 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,2 +1,6 @@ +@@ -1,3 +1,7 @@ classes: - cluster.all-mcp-ocata-common.opnfv.runtime + - cluster.all-mcp-ocata-common.opnfv.pod_config +parameters: + _param: + opnfv_user_username: opnfv -- cgit 1.2.3-korg