fix tempest invocation
Merge pull request #53 from bodepd/master

fix tempest invocation
update vm destruction

Previously, the multi_node vm destroy method did not
ensure that all controller's were destroyed. If you were
to run both a multi_node and multi_node_tempest run on the
same node, it leads to a case were two controllers exist and
there is an ip address conflict.

This commit updates the vm destroy methods need to ensure that they destroy all
multi-node vms.
Exclude swift tests when running tempest

Ensure that tempest does not test swift when
validating the multi_host scenario b/c
swift will not be installed.
Add control-tempest-server.yaml

This commit adds a hiera data file specific to the controller.

It is currently used to specify configuration that is specific
to selecting the Cirros base image for testing.
Update apache version

Currently, the version of the apache module used by the
puppet module I am using required a newer version than
the one that comes from CiscoSystems/grizzly.

This patch updates the apache repo to use master from
puppetlabs.
Update upstreams in Puppetfile

update the upstream references to point at Puppetlabs.
Merge pull request #54 from bodepd/master

updates to openstack-installer
Fix swift deployments

This commit updats the swift deployment code in an initial
attempt to get swift deployments working again.

1. ensures that the local_net_ip for the swift proxy is set
by moving that config to openstack.yaml
2. ensures that a controller is built as part of the openstack
scenerio.
Merge pull request #55 from bodepd/swift_fix

Fix swift deployments
rebase