Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build break around dynamic links - pulls in some of rob's import changes and Andi's nagios changes. [5/6] #154

Merged
merged 54 commits into from Mar 2, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
890e47e
Add dev tool into release for release management
Feb 16, 2012
d586491
Pull in networking barclamp bugfixes
Feb 16, 2012
a546a5d
Pull in rabbitmq bugfixes
Feb 16, 2012
d5c7f31
Pull in build_lib.sh and dev updates
VictorLowther Feb 17, 2012
c802942
Only find child branches that are in the current release.
VictorLowther Feb 17, 2012
31f8d15
Update gitgnore so dev works.
galthaus Feb 18, 2012
a986f34
Add pull request support as well
galthaus Feb 18, 2012
2c70d4a
Merge pull request #107 from galthaus/a986f34bb618abb6fd5fcf08355e9a1…
galthaus Feb 18, 2012
cbd08cd
Import updates to let dev build crowbar, and update this build_crowba…
VictorLowther Feb 20, 2012
58aa99c
Pull in latest dev and build_lib code.
VictorLowther Feb 20, 2012
32c794e
Oops, missed quoting a path that needs quoting
VictorLowther Feb 20, 2012
d7f215f
Import latest dev and build_lib.sh
Feb 21, 2012
1a9c850
Ensure that builds have up-to-date tracking branches.
Feb 21, 2012
70ccba0
Make locking when using dev to run builds more robust.
VictorLowther Feb 21, 2012
45d02c5
Make release switching update tracking branches in the build cache.
VictorLowther Feb 21, 2012
47f6af9
Actaully skip generating an ISO if we were asked not to.
VictorLowther Feb 21, 2012
b11ffb4
Ensure that sync and pull requests only operate on branches that exist.
VictorLowther Feb 23, 2012
27563d0
Make switch_barclamps_to assume less about where it is being run from.
VictorLowther Feb 23, 2012
3f67a2a
Rework initial checkout code for submodules.
VictorLowther Feb 23, 2012
ccf82ea
Abstract out submodule cloning.
VictorLowther Feb 23, 2012
5a82033
Make sure we check out missing barclamps when switching branches.
VictorLowther Feb 23, 2012
26c4019
Update reference with networking changes - better json files
galthaus Feb 24, 2012
ebfc14d
Merge pull request #121 from galthaus/26c4019197c59e26c9c7eb992d649ea…
Feb 24, 2012
a849e4a
Rework setup to make it aware of all the releases.
VictorLowther Feb 24, 2012
6573b8f
Only switch branches in the build cache when actually doing a build.
VictorLowther Feb 24, 2012
9cdf403
Add all_ordered_branches, and update backup and fetch to use it.
VictorLowther Feb 24, 2012
2ea37fd
Merge remote-tracking branch 'origin/release/fledermaus/master' into …
VictorLowther Feb 24, 2012
7be61dd
Import dev updates from the master branch
VictorLowther Feb 24, 2012
89adaf8
Add updated submodule references for release/fledermaus/master
Feb 24, 2012
48b2a41
Merge pull request #126 from aabes/89adaf8a9d70b4dd3618a059fa242d8372…
galthaus Feb 24, 2012
16ff755
Add DE626 to the 1.2.1 tree
galthaus Feb 24, 2012
464528d
Merge remote-tracking branch 'origin/release/fledermaus/master' into …
galthaus Feb 24, 2012
5309add
Merge pull request #128 from galthaus/464528d82bca5935d1dd533a4052521…
VictorLowther Feb 24, 2012
09f6e66
Clean the network refs and fix dev to use single quotes for GITHUB va…
galthaus Feb 27, 2012
9c8e47c
Put the wrong path in the Ubuntu code.
galthaus Feb 28, 2012
73b7c25
Merge pull request #148 from galthaus/9c8e47c9dfd89de64a6a8ca92784396…
Feb 28, 2012
7ebe653
add commit & data information to catalog during barclamp import
Feb 29, 2012
83955b4
Update the dynamic link code to handle nil public networks
galthaus Mar 1, 2012
a4edf90
Merge remote-tracking branch 'dell/master'
galthaus Mar 1, 2012
6fcd3b6
Merge branch 'master' into openstack-os-build
galthaus Mar 1, 2012
e794e8d
Merge pull request #150 from VictorLowther/feature/paranoid-install-c…
galthaus Mar 1, 2012
a297c6b
Merge branch 'release/fledermaus/master' of https://github.com/dellcl…
Mar 1, 2012
07f020e
Merge remote-tracking branch 'dell/master'
galthaus Mar 1, 2012
0719542
Merge remote-tracking branch 'origin/master'
galthaus Mar 1, 2012
81152be
Merge remote-tracking branch 'dell/openstack-os-build' into openstack…
galthaus Mar 1, 2012
6f67c24
Merge remote-tracking branch 'origin/openstack-os-build' into opensta…
galthaus Mar 1, 2012
7ec3723
Merge branch 'master' into openstack-os-build
galthaus Mar 1, 2012
8b58f0f
Pull in Andi's nagios fixes and my build break fix for Nagios. These…
galthaus Mar 1, 2012
4ee8fb7
Merge branch 'master' into openstack-os-build
galthaus Mar 1, 2012
0a15738
Merge branch 'master' into openstack-os-build
Mar 1, 2012
f2c06b0
bring in changes needed for import (barclamp catalog needs git date a…
Mar 1, 2012
b91c58f
Merge remote-tracking branch 'origin/master'
galthaus Mar 1, 2012
731ed23
Merge remote-tracking branch 'dell/openstack-os-build' into openstack…
galthaus Mar 1, 2012
20f5bef
Merge branch 'master' into openstack-os-build
galthaus Mar 1, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion barclamps/ganglia
2 changes: 1 addition & 1 deletion barclamps/provisioner
3 changes: 3 additions & 0 deletions extra/barclamp_mgmt_lib.rb
Expand Up @@ -90,6 +90,9 @@ def catalog(path)
cat['barclamps'][name]['order'] = bc['crowbar']['order'] if bc['crowbar']['order']
cat['barclamps'][name]['run_order'] = bc['crowbar']['run_order'] if bc['crowbar']['run_order']
cat['barclamps'][name]['chef_order'] = bc['crowbar']['chef_order'] if bc['crowbar']['chef_order']
cat['barclamps'][name]['date'] = bc['git']['date'] if bc['git']['date']
cat['barclamps'][name]['commit'] = bc['git']['commit'] if bc['git']['commit']

end
File.open( File.join(CROWBAR_PATH, 'config', 'catalog.yml'), 'w' ) do |out|
YAML.dump( cat, out )
Expand Down