From 8d9c123f95a01c40946f7bf8e4a9d94aec9d7b3f Mon Sep 17 00:00:00 2001 From: "Mark T. Voelker" Date: Thu, 13 Mar 2014 14:42:57 -0400 Subject: [PATCH 1/9] Fix outdated openstack_repo_location for HA Some time back the expected value of the openstack_repo_url parameter was changed to make it more flexible. The update was done in such a way that the puppet-coe module would detect if the old format was used and correct it on the fly, emitting a warning in the process to let the user know what it did. A composition layer change was made to set the new format in ebfc0a2801f63982ecc83883f8f1885da5692fd4, but only in data/hiera_data/vendor/cisco_coi_common.yaml. However, the value is also explicitly set for HA scenarios in data/hiera_data/enable_ha/true.yaml and that file was never updated with the new format. Thus, users of HA scenarios see a warning emitted. This patch updates the setting for HA scenarios so the warning goes away. Change-Id: I13bc10ea4ccbc064e8d76468b6bdae9df599f2d8 Closes-Bug: #1292152 --- data/hiera_data/enable_ha/true.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/hiera_data/enable_ha/true.yaml b/data/hiera_data/enable_ha/true.yaml index 5a81d3e..9823ace 100644 --- a/data/hiera_data/enable_ha/true.yaml +++ b/data/hiera_data/enable_ha/true.yaml @@ -10,7 +10,7 @@ enabled: true # # always use the cisco repos when HA is enabled # -coe::base::openstack_repo_location: http://openstack-repo.cisco.com/openstack +coe::base::openstack_repo_location: http://openstack-repo.cisco.com/openstack/cisco coe::base::supplemental_repo: http://openstack-repo.cisco.com/openstack/cisco_supplemental coe::base::package_repo: cisco_repo From 5a1adfe4043db6f08595cce849e61c5c4808df11 Mon Sep 17 00:00:00 2001 From: Chris Ricker Date: Thu, 20 Mar 2014 12:32:34 -0700 Subject: [PATCH 2/9] Remove automatic configuration of nagios Drop calls of naginator module classes to configure nagios by default as the module design does not align with Puppet workflows as used with stackforge modules, and as most users have preferred NMS solutions which they use instead of the default example Nagios setup this created. Change-Id: I51ba18b7c059a07e686ef0f2410d266ef08a37b8 Implements: blueprint nagios-ectomy (cherry picked from commit 9e2588374a61e1f298007368fd23b445813d6b42) --- Puppetfile | 1 - data/class_groups/build.yaml | 1 - data/scenarios/2_role.yaml | 2 -- data/scenarios/all_in_one.yaml | 2 -- data/scenarios/full_ha.yaml | 4 ---- data/scenarios/swift.yaml | 1 - modules.list | 1 - 7 files changed, 12 deletions(-) diff --git a/Puppetfile b/Puppetfile index ad83a8b..c458c46 100644 --- a/Puppetfile +++ b/Puppetfile @@ -177,7 +177,6 @@ cisco_module_prefix = "#{base_url}/CiscoSystems/puppet-" 'graphite', 'pip', 'dnsmasq', - 'naginator' ].each do |module_name| mod "CiscoSystems/#{module_name}", :git => "#{cisco_module_prefix}#{module_name}", diff --git a/data/class_groups/build.yaml b/data/class_groups/build.yaml index 4ffaf6a..bec6ccf 100644 --- a/data/class_groups/build.yaml +++ b/data/class_groups/build.yaml @@ -1,6 +1,5 @@ classes: - apache - - naginator - collectd # - coi::profiles::cobbler_server - coi::profiles::cache_server diff --git a/data/scenarios/2_role.yaml b/data/scenarios/2_role.yaml index 4d643d6..630b8a3 100644 --- a/data/scenarios/2_role.yaml +++ b/data/scenarios/2_role.yaml @@ -13,7 +13,6 @@ roles: - build controller: classes: - - naginator::control_target - coe::base class_groups: - controller @@ -22,7 +21,6 @@ roles: compute: classes: - coe::base - - naginator::compute_target - cinder::setup_test_volume class_groups: - compute diff --git a/data/scenarios/all_in_one.yaml b/data/scenarios/all_in_one.yaml index c51a61c..8a22114 100644 --- a/data/scenarios/all_in_one.yaml +++ b/data/scenarios/all_in_one.yaml @@ -5,7 +5,6 @@ roles: all_in_one: classes: - coe::base - - naginator::compute_target - cinder::setup_test_volume - openstack::swift::proxy - openstack::swift::storage-node @@ -18,7 +17,6 @@ roles: compute: classes: - coe::base - - naginator::compute_target - cinder::setup_test_volume class_groups: - compute diff --git a/data/scenarios/full_ha.yaml b/data/scenarios/full_ha.yaml index 48e8c83..f3e1f2c 100644 --- a/data/scenarios/full_ha.yaml +++ b/data/scenarios/full_ha.yaml @@ -10,7 +10,6 @@ roles: - build controller: classes: - - naginator::control_target - coe::base - coe::network::interface - mongodb::replset @@ -21,7 +20,6 @@ roles: - ceph_mon controller_without_mon: classes: - - naginator::control_target - coe::base - coe::network::interface - mongodb::replset @@ -37,7 +35,6 @@ roles: classes: - coe::base - coe::network::interface - - naginator::compute_target - cinder::setup_test_volume class_groups: - compute @@ -46,7 +43,6 @@ roles: classes: - coe::base - coe::network::interface - - naginator::compute_target - cinder::setup_test_volume class_groups: - compute diff --git a/data/scenarios/swift.yaml b/data/scenarios/swift.yaml index 1fdc913..5fc1062 100644 --- a/data/scenarios/swift.yaml +++ b/data/scenarios/swift.yaml @@ -10,7 +10,6 @@ roles: - build controller: classes: - - naginator::control_target - coe::base class_groups: - controller diff --git a/modules.list b/modules.list index cd73ac5..4f47585 100644 --- a/modules.list +++ b/modules.list @@ -27,7 +27,6 @@ keystone memcached mongodb mysql -naginator network neutron nova From ebb9d94887fd3f49668e8c7bf774614873961171 Mon Sep 17 00:00:00 2001 From: "Mark T. Voelker" Date: Wed, 16 Apr 2014 14:39:29 -0400 Subject: [PATCH 3/9] Fix region data mappings The region data mappings contain a couple of typos (single ':' instead of two separating class names), and a few more need to be added for classes that have added region params over time. This patch corrects errant mappings and adds missing ones. Thanks to Ken Schroeder for the find and suggested fix. Change-Id: I5fc5ae1b41ddc3fc5ddf5d7a481a5191a590509e Closes-Bug: #1308366 (cherry picked from commit fbc939d1e10dc2a9aa91dd71390cda8c25c75f2d) --- data/data_mappings/common.yaml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/data/data_mappings/common.yaml b/data/data_mappings/common.yaml index 3347f1a..88b4d5a 100644 --- a/data/data_mappings/common.yaml +++ b/data/data_mappings/common.yaml @@ -299,9 +299,9 @@ package_ensure: - neutron::agents::vpnaas::package_ensure region: - cinder::keystone::auth::region - - glance:keystone::auth::region - - nova:keystone::auth::region - - quantum:keystone::auth::region + - glance::keystone::auth::region + - nova::keystone::auth::region + - quantum::keystone::auth::region - neutron::keystone::auth::region - keystone::endpoint::region - nova::network::quantumclient::quantum_region_name @@ -309,6 +309,16 @@ region: - quantum::agents::metadata::auth_region - neutron::agents::metadata::auth_region - ceilometer::keystone::auth::region + - heat::keystone::auth::region + - heat::keystone::auth_cfn::region + - nova::network::neutron::neutron_region_name + - neutron::keystone::auth::region + - openstack-ha::controller::region + - openstack::controller::region + - openstack::keystone::region + - openstack::all::region + - openstack::auth_file::region_name + - swift::keystone::auth::region neutron_sync_db: - neutron::server::sync_db # SSL support From 7fbc892bf0ace4a017a8d397fb5bf8c7be7331fb Mon Sep 17 00:00:00 2001 From: "Mark T. Voelker" Date: Tue, 15 Apr 2014 17:31:29 -0400 Subject: [PATCH 4/9] Fix potential duplicate resource error in AIO When cobbler is enabled in the AIO scenario, there is a potential duplicate resource conflict when defining hosts in the /etc/hosts file. Puppet-coi and puppet-coe both create host definitions (one for the control node and one for the build node...which for AIO are actually the same). Install.sh creates a user.yaml when called with the all_in_one scenario set and populates the control node addresses into it...but doesn't populate cobbler_node_ip. This can lead to a duplicate resource error because although the two modules both use ensure_resource, the IP addresses aren't set consistently in user.yaml for the AIO scenario. This patch corrects the problem by having install.sh set cobbler_node_ip to the same IP address used for the controller. Change-Id: Iafbe9b2603ab782d1ab8fd666312ca14bb6dd7f0 Closes-Bug: #1308257 (cherry picked from commit 9bba6931c8181a28d03a74306229088497ab763a) --- install-scripts/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-scripts/install.sh b/install-scripts/install.sh index c8c10c9..b57cade 100755 --- a/install-scripts/install.sh +++ b/install-scripts/install.sh @@ -90,6 +90,7 @@ ntp_servers: build_node_name: ${build_server} coe::base::controller_hostname: "${build_server}" controller_internal_address: "${build_server_ip}" +cobbler_node_ip: "${build_server_ip}" controller_public_address: "${build_server_ip}" controller_admin_address: "${build_server_ip}" swift_internal_address: "${build_server_ip}" From 994d258e3e2538ded92aae4fa3730577c6f7fa9d Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Wed, 16 Apr 2014 15:05:10 -0400 Subject: [PATCH 5/9] Fixes for HA proxy start issue This commit resolves - * Issue where Apache is not listening on right bind address * Issue where nova novpc should bind to a physical address instead of vip. Fixes bug#1307536 & bug#1307537 Change-Id: I6f64e99ec7b62cff99bfec9666ca91655580a35c --- data/data_mappings/enable_ha/true.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/data_mappings/enable_ha/true.yaml b/data/data_mappings/enable_ha/true.yaml index 10b018a..ca92d6f 100644 --- a/data/data_mappings/enable_ha/true.yaml +++ b/data/data_mappings/enable_ha/true.yaml @@ -32,10 +32,12 @@ allowed_hosts: - quantum::db::mysql::allowed_hosts - neutron::db::mysql::allowed_hosts bind_address: + - horizon:bind_address - horizon::cache_server_ip - cinder::api::bind_host - glance::registry::bind_host - glance::api::bind_host + - nova::vncproxy::host - nova::api::api_bind_address - mysql::config::bind_address - keystone::bind_host From 074817a18618d3845461a94f9c214853df9448a8 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Tue, 22 Apr 2014 09:19:43 -0400 Subject: [PATCH 6/9] Fix typo in horizon bind address fix the class parameter typo in true.yaml bind address for horizon. Change-Id: Icce56e43e6742b90851c148bc723a1b7005f7a54 --- data/data_mappings/enable_ha/true.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/data_mappings/enable_ha/true.yaml b/data/data_mappings/enable_ha/true.yaml index ca92d6f..9d985c2 100644 --- a/data/data_mappings/enable_ha/true.yaml +++ b/data/data_mappings/enable_ha/true.yaml @@ -32,7 +32,7 @@ allowed_hosts: - quantum::db::mysql::allowed_hosts - neutron::db::mysql::allowed_hosts bind_address: - - horizon:bind_address + - horizon::bind_address - horizon::cache_server_ip - cinder::api::bind_host - glance::registry::bind_host From 415790090bd3156c0bf273461553e5aa01ada71c Mon Sep 17 00:00:00 2001 From: "Mark T. Voelker" Date: Fri, 2 May 2014 09:19:16 -0400 Subject: [PATCH 7/9] Add mapping for ceilometer agent auth_region I5fc5ae1b41 added several missing region data mappings. However, one further mapping is also needed: we don't currently have a mapping for the region setting in the ceilometer agent. This patch adds a mapping for the ceilometer::agent::auth::auth_region parameter. Change-Id: I66e890737bbbd00a296e0bfa861ca8992b472c17 Closes-Bug: #1308366 --- data/data_mappings/common.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/data_mappings/common.yaml b/data/data_mappings/common.yaml index 88b4d5a..8a85dfb 100644 --- a/data/data_mappings/common.yaml +++ b/data/data_mappings/common.yaml @@ -309,6 +309,7 @@ region: - quantum::agents::metadata::auth_region - neutron::agents::metadata::auth_region - ceilometer::keystone::auth::region + - ceilometer::agent::auth::auth_region - heat::keystone::auth::region - heat::keystone::auth_cfn::region - nova::network::neutron::neutron_region_name From 9658a0e897b4decba3fea16aeb4f5023fa9e9485 Mon Sep 17 00:00:00 2001 From: Francois Deppierraz Date: Wed, 21 May 2014 17:13:07 +0200 Subject: [PATCH 8/9] Pin modules to the stable/havana branch master will probably bring icehouse specific changes which might break in havana. Change-Id: I4193c00e773f45561da9a9ce1dcf373b48648946 --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index c458c46..19b7c80 100644 --- a/Puppetfile +++ b/Puppetfile @@ -41,7 +41,7 @@ else if openstack_version == 'grizzly' openstack_module_branch = 'stable/grizzly' elsif openstack_version == 'havana' - openstack_module_branch = 'master' + openstack_module_branch = 'stable/havana' else abort('only grizzly and havana are supported atm') end From 11961486b2dca8252c4898fb6ae527f0a505b71c Mon Sep 17 00:00:00 2001 From: don Date: Fri, 20 Jun 2014 08:56:44 -0700 Subject: [PATCH 9/9] Fixup for Cinder iSCSI volumes Cinder could only attach volumes to instances that were on the same node. This is due to the iscsi listening address set to 0.0.0.0. Attaching the listener to a interface resolves the problem and allows volume operations from/to any host. Change-Id: Ia66c4f7f7278e2056d1ca3770ed2461259cca4e8 (cherry picked from commit 7b2e70a9a50bf202203ebb82939907c4317cef9a) --- data/hiera_data/common.yaml | 4 ---- data/hiera_data/user.common.yaml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/hiera_data/common.yaml b/data/hiera_data/common.yaml index 4bf9c76..961c0f2 100644 --- a/data/hiera_data/common.yaml +++ b/data/hiera_data/common.yaml @@ -148,10 +148,6 @@ openstack::test_file::image_type: cirros # This is often overridden in higher-layer yaml files. openstack::client::ceilometer: false -# The ISCSI IP address given to initiators when using the iSCSI driver -# for Cinder. This should generally match the public IP address. -cinder::volume::iscsi::iscsi_ip_address: 0.0.0.0 - # How to set the swift_store_user directive in swift.conf. # This should be an account name and a username separated by # a colon. diff --git a/data/hiera_data/user.common.yaml b/data/hiera_data/user.common.yaml index 6fa8fc2..942749a 100644 --- a/data/hiera_data/user.common.yaml +++ b/data/hiera_data/user.common.yaml @@ -80,6 +80,9 @@ public_interface: eth1 # be set to the same interface as public_interface. private_interface: eth1 +# iSCSI listener interface. Set this the s ame as public_interface. +cinder::volume::iscsi::iscsi_ip_address: "%{ipaddress_eth1}" + ### Cobbler config # The IP address of the node on which Cobbler will be installed and # on which it will listen.