summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-18 20:59:56 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-18 21:00:57 +0100
commiteb64afe779a7db456d51b9486515ee97e762e9c6 (patch)
tree6c739c9536819d5ea33cefcc74e6727cb2070e64
parent30993030ea4b5a35ab4ae9d0aeb6be85c1e259c3 (diff)
[Horizon] Fix 'mcp' version check pattern
Previous commit used a pattern that is too generic and always matches the substring 'mcp' vs the node hostname, not only pkg version. Fixes: 4658acf Change-Id: Ia4dcbbf7cdfa68574c86459217101d83d61add01 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rwxr-xr-xmcp/config/states/openstack_ha2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 302de8715..4f3760f64 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -66,7 +66,7 @@ salt -I 'horizon:server' state.sls horizon
salt -I 'nginx:server' state.sls nginx
# workaround for Ubuntu Pike Horizon missing css, FUEL-324
-if ! salt -C 'I@horizon:server and *01*' --out=yaml pkg.version openstack-dashboard | grep -qE 'mcp'; then
+if ! salt -C 'I@horizon:server and *01*' --out=yaml pkg.version openstack-dashboard | grep -qE ':.*mcp'; then
salt -I 'horizon:server' file.symlink \
/var/lib/openstack-dashboard/static \
/usr/share/openstack-dashboard/static