diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-20 08:48:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-20 08:48:15 +0000 |
| commit | 28466aae0d2fdd37d8e7c8462291216607f1a41e (patch) | |
| tree | c3fc56b10056ec0dda7ab00b26edacbadc04025d | |
| parent | 6e61fe6f7f5bd0ad217b723b7b31e53c7a28c916 (diff) | |
| parent | 5b6bcf0245061db1ca5bdaf59fc371d982f00b12 (diff) | |
Merge "Move NTP and Memacache respectively into step 1 and step 2"
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index ea2d2108..9f266b6a 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -37,6 +37,10 @@ if $::hostname == downcase(hiera('bootstrap_nodeid')) { if hiera('step') >= 1 { + if count(hiera('ntp::servers')) > 0 { + include ::ntp + } + $controller_node_ips = split(hiera('controller_node_ips'), ',') $controller_node_names = split(downcase(hiera('controller_node_names')), ',') class { '::tripleo::loadbalancer' : @@ -163,10 +167,6 @@ if hiera('step') >= 2 { } } - if count(hiera('ntp::servers')) > 0 { - include ::ntp - } - # MongoDB if downcase(hiera('ceilometer_backend')) == 'mongodb' { $mongo_node_ips = split(hiera('mongo_node_ips'), ',') @@ -373,6 +373,9 @@ MYSQL_HOST=localhost\n", include ::ceph::profile::osd } + # Memcached + include ::memcached + } #END STEP 2 if (hiera('step') >= 3 and $pacemaker_master) or hiera('step') >= 4 { @@ -534,7 +537,6 @@ if (hiera('step') >= 3 and $pacemaker_master) or hiera('step') >= 4 { } # swift proxy - include ::memcached include ::swift::proxy include ::swift::proxy::proxy_logging include ::swift::proxy::healthcheck |