summaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-18 15:50:09 +0000
committerGerrit Code Review <review@openstack.org>2015-03-18 15:50:09 +0000
commit5e7928431e0ba0afd91ef924d43ca5fb28b345fa (patch)
tree410decbb3a39140dd1908e74cfe3472b906c4a17 /puppet/controller-puppet.yaml
parent29327cd0902cc88229c693b44449f03bf88e911f (diff)
parent285e53d1350e2a87e65d79c7a1ec7438cb2613e2 (diff)
Merge "puppet/loadbalancer: use puppet-tripleo"
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r--puppet/controller-puppet.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 76e5483a..1892b68f 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -740,6 +740,11 @@ resources:
controller_virtual_ip: {get_input: controller_virtual_ip}
public_virtual_interface: {get_input: public_virtual_interface}
public_virtual_ip: {get_input: public_virtual_ip}
+ tripleo::loadbalancer::controller_host: {get_input: controller_host}
+ tripleo::loadbalancer::control_virtual_interface: {get_input: control_virtual_interface}
+ tripleo::loadbalancer::controller_virtual_ip: {get_input: controller_virtual_ip}
+ tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface}
+ tripleo::loadbalancer::public_virtual_ip: {get_input: public_virtual_ip}
enable_package_install: {get_input: enable_package_install}
outputs: