Merge branch 'master' of https://github.com/stackforge/puppet_openstack_builder
Add -y to apt-get command

The apt-get command that installs puppet modules when using a package-
based install lacks the -y flag.  On most systems this doesn't
seem to be a problem since dependencies are already installed.
However on some systems this can cause the install to fail out
if a dependency is needed (thus cause apt-get to interactively
ask the user if it's ok to install the dependency as well).

Thanks to Jon Skarpeteig for reporting the issue.

Change-Id: I9dddde04cf7f8ef2e777ff9f1bc9feed1cfd6c83
Merge branch 'coi-development' of https://github.com/CiscoSystems/puppet_openstack_builder
Merge "Add -y to apt-get command"
Keystone access from Horizon fails in full_ha

In full_ha horizon is currently configured to access keystone via
localhost, but keystone is configured not to bind to localhost. As
a result, authentication to horizon fails.

Add a parameter to full_ha scenario specifying the location of
keystone for horizon to use.

Change-Id: I1333069f7f6994908deae50b78ae8252593502d8
Closes-Bug: #1273934
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into coi-development
Don't map controller_hostname to an IP address

The current data mappings set coe::base::controller_hostname
to an IP address.  This results in an invalid entry in
/etc/hosts containing two IP addresses rather than an IP address
and a hostname.  The problem doesn't affect the full_ha
scenario as it overrides the setting in user.full_ha.yaml.  This
patch removes the broken mapping and adds a similar config to
user.common.yaml, resulting in a clean /etc/hosts file.

Change-Id: Ibdb436ce0f5d08fd6acbadebc7323ac374a46207
Partial-Bug: #1274263
apt-get dist-upgrade needed after adding repos

apt-get dist-upgrade is needed after adding a vendor repo to ensure
that any packages in the vendor repo which need to override "baseline"
packages get in place.

Change-Id: Id70ff9200ce0a19cf4900eaafda5bb3c8c5ee480
Partial-Bug: #1273777
Add a bunch of inline documentation

Users of puppet_openstack_builder are often befuddled by the lack
of inline data in the files they are most commonly expected to
modify (e.g. the user.x.yaml files where things like hostnames,
IP addresses, and passwords are typicall entered).  This patch
provides inline documentation to make the files less mysterious
to new users.

Change-Id: I1ece3c968dfc74ff7fd636ef1c0bf9e67d567a41
Partial-Bug: #1270381
Merge branch 'master' of https://github.com/stackforge/puppet_openstack_builder into coi-development

Conflicts:
	data/hiera_data/user.common.yaml
Add inline docs for common.yaml

The common.yaml file lacks inline documentation, which makes it harder
for users to understand.  This patch adds inline documentation to
make the file more self-documenting.

Change-Id: Iba98f2a829ff9b5b8ae6d2242544f0507866567c
Partial-Bug: #1270381
Enable nova to do live migration

Set the nova::compute::libvirt::migration_support param
to true by default. It was previously no present.

Change-Id: I3657969e0a921b406e14b44aae15912bd80103e6
Merge branch 'master' of https://github.com/stackforge/puppet_openstack_builder into coi-development
Remove duplicated variable definition

swift_local_net_ip is defined twice in user.common.yaml. Remove
one of the entries for clarity.

Change-Id: I182ba7dd2d59ec2e038b25fcdc55ddebf947ca2f
Closes-Bug: #1277076
Include ceilometer alarm services

Add the ceilometer alarm notifier and
evaluator services as part of the
controller deployment

Change-Id: I8b792f6c936cb86c3944b99cecffab069d174b65
Added support for running ceph on compute nodes.

Added an option to enable ceph to run on nodes that are
running compute services. This is due to the need to configure
virsh with the ceph secret on compute nodes. I also added
examples on how a user can configure their journal
settings in ceph01.xml.

Change-Id: I4dd475a73664a9a2d1baf38851f5e85e4e2b41d7
Closes-Bug: #1274649
Fix controller_hostname in install.sh for AIO

Ibdb436ce0f removed a bad ip->hostname mapping from
data/data_mappings/common.yaml and replaced it with an
explicit declaration of coe::base::controller_hostname
in user.common.yaml.  However: in an AIO install the
install.sh script doesn't do anything to override the
sample value from user.common.yaml, so it always gets
set to 'control-server' regardless of the node's actual
hostname.  This patch explicitly sets the value in the
install.sh script to avoid this problem.

Change-Id: I2f4f7d8e3b50cf22015e9445b697458f854f16e0
Partial-Bug: #1274263
Merge branch 'master' of https://github.com/stackforge/puppet_openstack_builder into coi-development

Conflicts:
	data/hiera_data/hostname/ceph01.yaml
Set script perms to 0755

Only the install.sh script has the proper permissions. Changed
the additional scripts to 0755 also

Change-Id: I1df3202ae901f96484469c49b0029cbc7fb2ddfa