aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2014-12-19 21:48:45 -0500
committerDan Prince <dprince@redhat.com>2015-01-08 09:52:50 -0500
commit9cf11371ac3a99648e21518059bfa310655769e0 (patch)
tree2683d1bf3d564626c7e604be29e8f40a08dfea10 /overcloud-resource-registry.yaml
parente38535b528e3a611d5fe623b3e0212b88c48395e (diff)
Puppet: overcloud controller config
This patch provides an alternate implementation of the OS::TripleO::Controller::SoftwareConfig which uses Puppet to drive the configuration. Using this it is possible to create a fully functional overcloud controller instance which has the controller node configured via Puppet stackforge modules. Initially this includes only the following services: MySQL RabbitMQ Keepalived/HAProxy (HA is not yet fully supported however) Nova Neutron Keystone Glance (file backend) Cinder Using these services it is possible to run devtest_overcloud.sh to completion. The idea is that we can quickly add more services once we have CI in place. In order to test this you'll want to build your images with these elements: os-net-config heat-config-puppet puppet-modules hiera None of the OpenStack specific TripleO elements should be used with this approach (the nova/neutron elements were NOT used to build the controller image). Also, rather than use neutron-openvswitch-agent to configure low level networking it is recommended that os-net-config by configured directly via heat modeling rather than parameter passing to init-neutron-ovs. This allows us to configure the physical network while avoiding the coupling to the neutron-openvswitch-element that our standard parameter driven networking currently uses. (We still need to move init-neutron-ovs so that it isn't coupled and/or deprecate its use entirely because the heat drive stuff is more flexible.) Packages may optionally be pre-installed via DIB using the -p option (-p openstack-neutron,openstack-nova) etc. Change-Id: If8462e4eacb08eced61a8b03fd7c3c4257e0b5b8
Diffstat (limited to 'overcloud-resource-registry.yaml')
-rw-r--r--overcloud-resource-registry.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml
index 09a3363b..249dee9b 100644
--- a/overcloud-resource-registry.yaml
+++ b/overcloud-resource-registry.yaml
@@ -3,7 +3,7 @@ resource_registry:
OS::TripleO::Compute: compute.yaml
OS::TripleO::Compute::SoftwareConfig: compute-config.yaml
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
- OS::TripleO::Net::SoftwareConfig: net-config-noop.yaml
OS::TripleO::Controller: controller.yaml
OS::TripleO::Controller::SoftwareConfig: controller-config.yaml
OS::TripleO::ObjectStorage: swift-storage.yaml
+ OS::TripleO::Net::SoftwareConfig: net-config-noop.yaml