Merge "Allow arbitrary amount of lines between Subscription Name and Pool ID"

This commit is contained in:
Jenkins
2016-03-10 09:33:09 +00:00
committed by Gerrit Code Review

View File

@@ -1086,9 +1086,10 @@ def run_rhsm_reg(host, username, password, optional=False, proxy_server=None,
# subscribe to required channel
cmd = ('subscription-manager list --consumed | grep -i openstack || '
'subscription-manager subscribe --pool %s')
pool = ("$(subscription-manager list --available"
" | grep -m1 -A15 'Red Hat Enterprise Linux OpenStack Platform'"
" | grep -i 'Pool ID:' | awk '{print $3}')")
pool = ("$(subscription-manager list --available | sed -n "
"\'/Red Hat Enterprise Linux OpenStack Platform/, /Pool ID:/"
" { s/Pool ID:[[:space:]]*\\([[:alnum:]]*\\)/\\1/ p} \'"
" | head -1 )")
server.append(cmd % pool)
if optional: