From 511e7fd6c631ac9854dc46fa17208e265ab9deb6 Mon Sep 17 00:00:00 2001 From: Kanzhe Jiang Date: Wed, 6 Jan 2016 17:37:12 -0800 Subject: [PATCH] switch the task order to restart cluster services after configuring all controllers Change-Id: I68b06cf11e1b51a9cce261f2b9345c38c3a7838b --- .../puppet/manifests/reconfigure-keystone.pp | 32 +++++++++++++ ...ure-services.pp => reconfigure-neutron.pp} | 6 +-- ...ure-services.pp => reconfigure-neutron.pp} | 17 +------ deployment_tasks.yaml | 47 +++++++++---------- 4 files changed, 57 insertions(+), 45 deletions(-) create mode 100644 deployment_scripts/puppet/manifests/reconfigure-keystone.pp rename deployment_scripts/puppet/manifests/{reconfigure-services.pp => reconfigure-neutron.pp} (83%) rename deployment_scripts/puppet/modules/bcf/manifests/p_only/{reconfigure-services.pp => reconfigure-neutron.pp} (95%) diff --git a/deployment_scripts/puppet/manifests/reconfigure-keystone.pp b/deployment_scripts/puppet/manifests/reconfigure-keystone.pp new file mode 100644 index 0000000..7430e6b --- /dev/null +++ b/deployment_scripts/puppet/manifests/reconfigure-keystone.pp @@ -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, +} diff --git a/deployment_scripts/puppet/manifests/reconfigure-services.pp b/deployment_scripts/puppet/manifests/reconfigure-neutron.pp similarity index 83% rename from deployment_scripts/puppet/manifests/reconfigure-services.pp rename to deployment_scripts/puppet/manifests/reconfigure-neutron.pp index 8d4ae1c..a39f19c 100755 --- a/deployment_scripts/puppet/manifests/reconfigure-services.pp +++ b/deployment_scripts/puppet/manifests/reconfigure-neutron.pp @@ -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 } diff --git a/deployment_scripts/puppet/modules/bcf/manifests/p_only/reconfigure-services.pp b/deployment_scripts/puppet/modules/bcf/manifests/p_only/reconfigure-neutron.pp similarity index 95% rename from deployment_scripts/puppet/modules/bcf/manifests/p_only/reconfigure-services.pp rename to deployment_scripts/puppet/modules/bcf/manifests/p_only/reconfigure-neutron.pp index ad341b4..72c2d97 100644 --- a/deployment_scripts/puppet/modules/bcf/manifests/p_only/reconfigure-services.pp +++ b/deployment_scripts/puppet/modules/bcf/manifests/p_only/reconfigure-neutron.pp @@ -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, - } } diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 2e5255c..2c54fb1 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -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