switch the task order to restart cluster services after configuring all controllers

Change-Id: I68b06cf11e1b51a9cce261f2b9345c38c3a7838b
This commit is contained in:
Kanzhe Jiang 2016-01-06 17:37:12 -08:00
parent 129e675a7a
commit 511e7fd6c6
4 changed files with 57 additions and 45 deletions

View File

@ -0,0 +1,32 @@
#
# Copyright 2015 BigSwitch Networks, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
notice("MODULAR: bigswitch reconfigure-keystone")
# configure /etc/keystone/keystone.conf
ini_setting { "keystone.conf notification driver":
ensure => present,
path => '/etc/keystone/keystone.conf',
section => 'DEFAULT',
key_val_separator => '=',
setting => 'notification_driver',
value => 'messaging',
notify => Service['keystone'],
}
service { 'keystone':
ensure => running,
enable => true,
}

View File

@ -13,11 +13,11 @@
# License for the specific language governing permissions and limitations
# under the License.
#
notice("MODULAR: bigswitch reconfigure-services")
notice("MODULAR: bigswitch reconfigure-neutron")
include bcf::params
if $bcf::params::openstack::bcf_mode == 'P-Only' {
include bcf::p_only::reconfigure-services
include bcf::p_only::reconfigure-neutron
}
else {
include bcf::p_v::reconfigure-services
include bcf::p_v::reconfigure-neutron
}

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
#
class bcf::p_only::reconfigure-services {
class bcf::p_only::reconfigure-neutron {
include bcf
include bcf::params
@ -91,17 +91,6 @@ class bcf::p_only::reconfigure-services {
notify => Service['neutron-server'],
}
# configure /etc/keystone/keystone.conf
ini_setting { "keystone.conf notification driver":
ensure => present,
path => '/etc/keystone/keystone.conf',
section => 'DEFAULT',
key_val_separator => '=',
setting => 'notification_driver',
value => 'messaging',
notify => Service['keystone'],
}
# config /etc/neutron/plugin.ini
ini_setting { "neutron plugin.ini firewall_driver":
ensure => present,
@ -300,8 +289,4 @@ class bcf::p_only::reconfigure-services {
ensure => running,
enable => true,
}
service { 'keystone':
ensure => running,
enable => true,
}
}

View File

@ -10,43 +10,47 @@
puppet_manifest: puppet/manifests/network-config.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
# Install common packages
#- id: bigswitch-repo
# type: puppet
# groups: [primary-controller, controller, compute]
# required_for: [post_deployment_end]
# requires: [post_deployment_start]
# parameters:
# puppet_manifest: puppet/manifests/common-repo.pp
# puppet_modules: puppet/modules:/etc/puppet/modules
# timeout: 720
# Only on primary controller: clean up the Neutron objects created
# by Fuel default deployment
- id: controller-cleanup
type: puppet
role: [primary-controller]
required_for: [post_deployment_end]
#requires: [bigswitch-repo]
requires: [post_deployment_start]
parameters:
puppet_manifest: puppet/manifests/purge-os.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
- id: reconfigure-services
- id: reconfigure-keystone
type: puppet
role: [primary-controller, controller]
required_for: [post_deployment_end]
requires: [controller-cleanup]
parameters:
puppet_manifest: puppet/manifests/reconfigure-services.pp
puppet_manifest: puppet/manifests/reconfigure-keystone.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
- id: reconfigure-controller-neutron
type: puppet
role: [controller]
required_for: [post_deployment_end]
requires: [reconfigure-keystone]
parameters:
puppet_manifest: puppet/manifests/reconfigure-neutron.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
- id: reconfigure-primary-controller-neutron
type: puppet
role: [primary-controller]
required_for: [post_deployment_end]
requires: [reconfigure-controller-neutron]
parameters:
puppet_manifest: puppet/manifests/reconfigure-neutron.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
- id: openstack-restart-cluster-services
type: puppet
role: [primary-controller]
required_for: [post_deployment_end]
requires: [reconfigure-services]
requires: [reconfigure-primary-controller-neutron]
parameters:
puppet_manifest: puppet/manifests/restart-cluster-services.pp
puppet_modules: puppet/modules:/etc/puppet/modules
@ -60,12 +64,3 @@
puppet_manifest: puppet/manifests/compute-config.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
# Reboot compute nodes, so they pick new network configuration
#- id: compute-reboot
# type: shell
# role: [compute]
# required_for: [post_deployment_end]
# requires: [compute-config]
# parameters:
# cmd: /sbin/reboot;
# timeout: 720