diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-03-18 15:50:09 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-03-18 15:50:09 +0000 |
commit | 5e7928431e0ba0afd91ef924d43ca5fb28b345fa (patch) | |
tree | 410decbb3a39140dd1908e74cfe3472b906c4a17 /puppet/manifests/overcloud_controller.pp | |
parent | 29327cd0902cc88229c693b44449f03bf88e911f (diff) | |
parent | 285e53d1350e2a87e65d79c7a1ec7438cb2613e2 (diff) |
Merge "puppet/loadbalancer: use puppet-tripleo"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index c9af578c..87cc7ec0 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -26,6 +26,12 @@ if !str2bool(hiera('enable_package_install', 'false')) { if hiera('step') >= 1 { + include ::tripleo::loadbalancer + +} + +if hiera('step') >= 2 { + if count(hiera('ntp::servers')) > 0 { include ::ntp } @@ -158,9 +164,9 @@ if hiera('step') >= 1 { include ::ceph::profile::mon } -} #END STEP 1 +} #END STEP 2 -if hiera('step') >= 2 { +if hiera('step') >= 3 { include ::keystone @@ -341,4 +347,4 @@ if hiera('step') >= 2 { snmpd_config => [ join(['rouser ', hiera('snmpd_readonly_user_name')]), 'proc cron', 'includeAllDisks 10%', 'master agentx', 'trapsink localhost public', 'iquerySecName internalUser', 'rouser internalUser', 'defaultMonitors yes', 'linkUpDownNotifications yes' ], } -} #END STEP 2 +} #END STEP 3 |