Skip to content
This repository has been archived by the owner on Dec 4, 2018. It is now read-only.

Block device allocation configuration (bsc#937800) #487

Merged

Conversation

nkrinner
Copy link
Contributor

Make block_device_allocate_retries and
block_device_allocate_retries_interval configurable from
the crowbar web ui in the raw view. See also
https://bugzilla.suse.com/show_bug.cgi?id=937800

(cherry picked from commit a876afb762a5d3c52526622a4c48cb43ce410c5a)

Conflicts:
chef/data_bags/crowbar/bc-template-nova.json

@nkrinner
Copy link
Contributor Author

I can't reopen the original pull request as I have force-pushed to my branch since closing the or.. So the work continues here. For reference: Discussion on this change started here: #476

This change got already merged (after some more discussion) in crowbar/crowbar-openstack#39

Some background why reopening a force-pushed pull-request is not possible:
isaacs/github#361

},
"block_device": {
"allocate_retries": 60,
"allocate_retries_interval": 3
}
}
},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing a revision bump.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is below..

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was not there when I commented ;-)

@nkrinner nkrinner force-pushed the configure-disk-allocation-timeout branch from dfcce86 to 8b4674f Compare October 1, 2015 06:24
@vuntz
Copy link
Member

vuntz commented Oct 1, 2015

+1

@dirkmueller
Copy link
Contributor

I'm fine with the changes, but I'd like to have the commit message updated to not reference some git id that doesn't exist (and remove the Conflicts marker). perhaps you can reference the PR from master ?

@nkrinner nkrinner force-pushed the configure-disk-allocation-timeout branch from 8b4674f to d6cc0d6 Compare October 1, 2015 08:53
@nkrinner
Copy link
Contributor Author

nkrinner commented Oct 1, 2015

Removed the conflicts marker and the commit id, although it actually does exist:
crowbar/crowbar-openstack@a876afb

@vuntz
Copy link
Member

vuntz commented Oct 1, 2015

@nkrinner it does exist, but in another git repo. That's why we can't just put the commit id. I think linking to the PR would be nice.

Make block_device_allocate_retries and
block_device_allocate_retries_interval configurable from
the crowbar web ui in the raw view. See also
https://bugzilla.suse.com/show_bug.cgi?id=937800

(Change picked from crowbar/crowbar-openstack#39 )
@nkrinner nkrinner force-pushed the configure-disk-allocation-timeout branch from d6cc0d6 to 93158ce Compare October 1, 2015 09:51
@nkrinner
Copy link
Contributor Author

nkrinner commented Oct 1, 2015

@vuntz I understand. I had the other repo added as a remote, so git could also resolve the commit id. I now added a link to the merged pull request.

@vuntz
Copy link
Member

vuntz commented Oct 1, 2015

No code change in the new commits, and the gating passed before commit message changed => merging.

vuntz added a commit that referenced this pull request Oct 1, 2015
Block device allocation configuration (bsc#937800)
@vuntz vuntz merged commit 407b707 into crowbar:release/tex/master Oct 1, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants