bug #1189723 : cobbler::node_type parameter eliminated
Use DNS name for web mirror, not hard-coded IP
Add trailing \n
HEAD should track -proposed repo

Use the grizzly-proposed repo for development, not the tagged
release repo
Reset key for running user as well as root
Merge pull request #127 from rakshithh/bug

bug #1189723 : cobbler::node_type parameter eliminated
Merge pull request #129 from iawells/multi-node

Remove old ssh keys when nodes are being rebuilt to avoid key complaints on next logging in
Implement multiple Quantum dhcp agents

This commit addresses the following blueprint:

https://blueprints.launchpad.net/openstack-cisco/+spec/multiple-quantum-dhcp-agents

It provides users with the ability to enable multiple
Quantum dhcp agents in their OpenStack cloud.  The default
settting is to run a dhcp agent only on the control node.
This commit adds a commented-out line to a compute node
definition that users can uncomment (and add to additional
compute node definitions) to enable multiple dhcp agents.
Change dhcp agent enablement to openstack::compute

Rather than calling the quantum classes directly, set a
param in the openstack::compute call instead.
Fix arrows alignment to comply with style guide
Merge pull request #131 from CiscoSystems/multi_dhcp_agent

Implement multiple Quantum dhcp agents
Merge pull request #86 from rickerc/use_grizzly-proposed

Use grizzly proposed
Add supplemental repo for binary packages

Enable a cisco_supplemental repo to be used for binary packages
which we distribute
Whitespace cleanup
Merge pull request #133 from rickerc/supplemental_repo

Add supplemental repo for binary packages and fix puppet arrow style.
Merge remote-tracking branch 'origin/multi-node' into multi-node-n1k

Conflicts:
	manifests/core.pp
	manifests/puppet_modules.py
	manifests/site.pp.example