Merge branch 'master' of https://github.com/gfa/example-configs into gfa-master

Conflicts:
	README.md
This commit is contained in:
Mike Dorman 2015-03-17 07:27:14 -06:00
commit ba55e849cd
1 changed files with 4 additions and 0 deletions

View File

@ -32,3 +32,7 @@ we know about:
NeCTAR uses puppet templates, mainly based on upstream pupet-openstack for a
multi-site production cloud, and several test clusters. Configs for multiple
versions are available. Search for puppet-{nova,designate...} repositories.
* https://github.com/gfa/os-sample-configs
Default configs for nova, keystone, cinder, ceilometer and heat.
For Debian and Ubuntu versions of Havana, Icehouse and Juno.