From d89b25921c2cd982dca92a55a46b98ed50a060a2 Mon Sep 17 00:00:00 2001 From: Sergey Vasilenko Date: Tue, 5 Jan 2016 17:56:18 +0300 Subject: [PATCH] No more use nodes list. Nodes list is deprecated, beause incompatible with network-roles model. Network metadata should be used instead. This patchset implements: * remove nodes list from fixtures * remove unused function filter_nodes * remove some unused code, related to nodes list * new parser function get_node_key_name() for generating immutable node key name * fix parser function roles_include() for using network_metadata * use roles_include() if need instead directly lookup into network_metadata * fix some manifests for use network_matadata/nodes Change-Id: I2e6b1cd5cb75263efc995aa9f62bd3073abed1b8 Related-bug: #1531128 Related-bug: #1538220 --- .../puppet/parser/functions/filter_nodes.rb | 9 -- .../parser/functions/get_node_key_name.rb | 13 ++ .../parser/functions/nodes_with_roles.rb | 27 ++-- .../puppet/parser/functions/roles_include.rb | 19 ++- .../modular/ceilometer/controller.pp | 1 - .../modular/database/database.pp | 3 +- .../osnailyfacter/modular/globals/globals.pp | 20 +-- .../modular/keystone/keystone.pp | 2 - .../osnailyfacter/modular/logging/logging.pp | 4 +- .../osnailyfacter/modular/ntp/ntp-client.pp | 4 +- .../openstack-cinder/openstack-cinder.pp | 6 +- .../openstack-controller.pp | 2 - .../osnailyfacter/modular/roles/cinder.pp | 28 ++-- .../osnailyfacter/modular/roles/compute.pp | 12 +- .../modular/vmware/cinder-vmware.pp | 6 +- .../spec/functions/get_node_key_name_spec.rb | 22 ++++ .../spec/functions/nodes_with_roles__spec.rb | 121 +++++++++++------ .../spec/functions/roles_include_spec.rb | 94 +++++++++---- .../osnailyfacter/templates/globals_yaml.erb | 3 +- .../astute.yaml/neut_gre.generate_vms.yaml | 69 ---------- ...vlan.ceph.ceil-compute.overridden_ssl.yaml | 53 -------- ...eil-primary-controller.overridden_ssl.yaml | 53 -------- ...neut_vlan.ceph.compute-ephemeral-ceph.yaml | 65 --------- ...t_vlan.ceph.controller-ephemeral-ceph.yaml | 55 -------- ...neut_vlan.cinder-block-device.compute.yaml | 123 +++--------------- .../astute.yaml/neut_vlan.compute.nossl.yaml | 93 ------------- .../neut_vlan.compute.ssl.overridden.yaml | 93 ------------- .../astute.yaml/neut_vlan.compute.ssl.yaml | 93 ------------- .../neut_vlan.ironic.conductor.yaml | 23 ---- .../neut_vlan.ironic.controller.yaml | 23 ---- .../neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml | 53 -------- .../neut_vlan_l3ha.ceph.ceil-compute.yaml | 53 -------- .../neut_vlan_l3ha.ceph.ceil-controller.yaml | 65 --------- ...lan_l3ha.ceph.ceil-primary-controller.yaml | 65 --------- ...eut_vlan_l3ha.ceph.ceil-primary-mongo.yaml | 53 -------- .../neut_vxlan_dvr.murano.sahara-cinder.yaml | 57 -------- .../neut_vxlan_dvr.murano.sahara-compute.yaml | 57 -------- ...ut_vxlan_dvr.murano.sahara-controller.yaml | 57 -------- ...ara-primary-controller.overridden_ssl.yaml | 57 -------- ..._dvr.murano.sahara-primary-controller.yaml | 57 -------- .../noop/spec/hosts/keystone/keystone_spec.rb | 6 - tests/noop/spec/hosts/roles/mongo_spec.rb | 1 - tests/noop/spec/hosts/swift/swift_spec.rb | 14 +- tests/noop/spec/lib/overrides.rb | 4 - 44 files changed, 272 insertions(+), 1466 deletions(-) delete mode 100644 deployment/puppet/openstack/lib/puppet/parser/functions/filter_nodes.rb create mode 100644 deployment/puppet/osnailyfacter/lib/puppet/parser/functions/get_node_key_name.rb create mode 100644 deployment/puppet/osnailyfacter/spec/functions/get_node_key_name_spec.rb diff --git a/deployment/puppet/openstack/lib/puppet/parser/functions/filter_nodes.rb b/deployment/puppet/openstack/lib/puppet/parser/functions/filter_nodes.rb deleted file mode 100644 index 89a58dae62..0000000000 --- a/deployment/puppet/openstack/lib/puppet/parser/functions/filter_nodes.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Puppet::Parser::Functions - newfunction(:filter_nodes, :type => :rvalue) do |args| - name = args[1] - value = args[2] - args[0].select do |it| - it[name] == value - end - end -end \ No newline at end of file diff --git a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/get_node_key_name.rb b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/get_node_key_name.rb new file mode 100644 index 0000000000..e48002fd0a --- /dev/null +++ b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/get_node_key_name.rb @@ -0,0 +1,13 @@ +module Puppet::Parser::Functions + newfunction(:get_node_key_name, :type => :rvalue, :doc => <<-EOS +Return a node key name. +Key name is a immutable name, that used as key into network_metadata/nodes hash +EOS + ) do |args| + uid = function_hiera ['uid'] + raise Puppet::ParseError, 'Node UID not found.' if uid.nil? + "node-#{uid}" + end +end + +# vim: set ts=2 sw=2 et : \ No newline at end of file diff --git a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/nodes_with_roles.rb b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/nodes_with_roles.rb index 0c1e3675a0..ca92fed5a2 100644 --- a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/nodes_with_roles.rb +++ b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/nodes_with_roles.rb @@ -1,18 +1,23 @@ module Puppet::Parser::Functions newfunction(:nodes_with_roles, :type => :rvalue, :doc => <<-EOS -Return a list of nodes that have one of the given roles. If attr is defined, -return just that attribute for each node instead of the whole node hash. +Return a list of nodes that have one of the given roles, ex: + nodes_with_roles(['primary-controller', 'controller']) + nodes_with_roles(['primary-controller', 'controller', 'ceph-mon'], 'name') + +If attr is defined, returns just that attribute for each node +instead of the whole node hash. EOS ) do |args| - nodes, roles, attr = args - nodes.select {|node| - roles.include? node['role'] - }.uniq {|node| - node['uid'] - }.map {|node| - attr ? node[attr] : node + raise Puppet::ParseError, 'Only one or 2 arguments allowed.' if args.size < 1 or args.size > 2 + roles, attr = args + raise Puppet::ParseError, 'Roles should be provided as array' if ! roles.is_a?(Array) + raise Puppet::ParseError, 'Attribute "name" should be provided as string' if ! (attr.is_a?(String) or attr == nil) + n_metadata = function_hiera_hash(['network_metadata', {}]) + n_metadata.fetch('nodes', {}).select {|k,v| + (roles & v.fetch('node_roles',[])).any? + }.map {|k,v| + attr ? v[attr] : v } end end - -# vim: set ts=2 sw=2 et : +# vim: set ts=2 sw=2 et : \ No newline at end of file diff --git a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/roles_include.rb b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/roles_include.rb index 56c00aefe3..256d79db77 100644 --- a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/roles_include.rb +++ b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/roles_include.rb @@ -4,19 +4,16 @@ module Puppet::Parser::Functions :type => :rvalue, :arity => 1, :doc => <<-EOS -Check if this node's roles include this role +Check if this node's roles include these roles. EOS - ) do |arguments| - raise Puppet::ParseError, 'No roles provided!' if arguments.size < 1 - intended_roles = arguments.first + ) do |args| + raise Puppet::ParseError, 'Only one argument with role or array of roles should be provided!' if args.size != 1 + intended_roles = args.first intended_roles = [intended_roles] unless intended_roles.is_a? Array - nodes = function_hiera ['nodes'] - uid = function_hiera ['uid'] + network_metadata = function_hiera_hash ['network_metadata'] + node_name = function_get_node_key_name [] + node_roles = network_metadata.fetch('nodes', {}).fetch(node_name, {}).fetch('node_roles', []) - nodes.any? do |node| - next unless node['uid'] == uid - next unless node['role'] - intended_roles.include? node['role'] - end + (node_roles & intended_roles).any? end end diff --git a/deployment/puppet/osnailyfacter/modular/ceilometer/controller.pp b/deployment/puppet/osnailyfacter/modular/ceilometer/controller.pp index e97ec69fbc..7bdd5b145a 100644 --- a/deployment/puppet/osnailyfacter/modular/ceilometer/controller.pp +++ b/deployment/puppet/osnailyfacter/modular/ceilometer/controller.pp @@ -18,7 +18,6 @@ $default_log_levels = hiera_hash('default_log_levels') $use_syslog = hiera('use_syslog', true) $use_stderr = hiera('use_stderr', false) $syslog_log_facility = hiera('syslog_log_facility_ceilometer', 'LOG_LOCAL0') -$nodes_hash = hiera('nodes') $storage_hash = hiera('storage') $rabbit_hash = hiera_hash('rabbit_hash') $management_vip = hiera('management_vip') diff --git a/deployment/puppet/osnailyfacter/modular/database/database.pp b/deployment/puppet/osnailyfacter/modular/database/database.pp index eba0fb91a9..bf67c4d126 100644 --- a/deployment/puppet/osnailyfacter/modular/database/database.pp +++ b/deployment/puppet/osnailyfacter/modular/database/database.pp @@ -2,6 +2,7 @@ notice('MODULAR: database.pp') $network_scheme = hiera_hash('network_scheme', {}) prepare_network_config($network_scheme) +$network_metadata = hiera_hash('network_metadata', {}) $use_syslog = hiera('use_syslog', true) $primary_controller = hiera('primary_controller') $mysql_hash = hiera_hash('mysql', {}) @@ -28,7 +29,7 @@ $mysql_skip_name_resolve = true $custom_setup_class = hiera('mysql_custom_setup_class', 'galera') # Get galera gcache factor based on cluster node's count -$galera_gcache_factor = count(unique(filter_hash(hiera('nodes', []), 'uid'))) +$galera_gcache_factor = count(keys($network_metadata['nodes'])) $status_user = 'clustercheck' $status_password = $mysql_hash['wsrep_password'] diff --git a/deployment/puppet/osnailyfacter/modular/globals/globals.pp b/deployment/puppet/osnailyfacter/modular/globals/globals.pp index f87b0c1954..5887bda6ac 100644 --- a/deployment/puppet/osnailyfacter/modular/globals/globals.pp +++ b/deployment/puppet/osnailyfacter/modular/globals/globals.pp @@ -19,18 +19,20 @@ if empty($network_metadata) { fail('Network_metadata not given in the astute.yaml') } -$node_name = regsubst(hiera('fqdn', $::hostname), '\..*$', '') -$node = $network_metadata['nodes'][$node_name] -if empty($node) { - fail('Node hostname is not defined in the astute.yaml') +$node_key_name = get_node_key_name() +$node_hash = $network_metadata['nodes'][$node_key_name] +if empty($node_hash) { + fail("Node ${node_key_name} is not defined in the network_metadata hash structure") } +if empty($node_hash['fqdn']) { + fail("Node ${node_key_name} has undefined fqdn name.") +} +# node_name is a short name from fqdn of node_hash. It may be changed while LCM +# and not the same, than immutable $node_key_name +$node_name = regsubst($node_hash['fqdn'], '\..*$', '') prepare_network_config($network_scheme) -# DEPRICATED -# nodes_hash is actually an array, not a hash -$nodes_hash = hiera('nodes', {}) - # MOS Ubuntu image uses Debian style packages. Since the introduction # of `$::os_package_type' fact avilable to use in project manifests, # we need to provide a manual override for Fuel Ubuntu images. @@ -54,7 +56,7 @@ if ($::osfamily == 'Debian'){ } $deployment_mode = hiera('deployment_mode', 'ha_compact') -$roles = $node['node_roles'] +$roles = $node_hash['node_roles'] $storage_hash = hiera('storage', {}) $syslog_hash = hiera('syslog', {}) $base_syslog_hash = hiera('base_syslog', {}) diff --git a/deployment/puppet/osnailyfacter/modular/keystone/keystone.pp b/deployment/puppet/osnailyfacter/modular/keystone/keystone.pp index 9d37ee8d74..65d9b58182 100644 --- a/deployment/puppet/osnailyfacter/modular/keystone/keystone.pp +++ b/deployment/puppet/osnailyfacter/modular/keystone/keystone.pp @@ -4,8 +4,6 @@ $network_scheme = hiera_hash('network_scheme', {}) $network_metadata = hiera_hash('network_metadata', {}) prepare_network_config($network_scheme) -$node_name = hiera('node_name') - $keystone_hash = hiera_hash('keystone', {}) $verbose = pick($keystone_hash['verbose'], hiera('verbose', true)) $debug = pick($keystone_hash['debug'], hiera('debug', false)) diff --git a/deployment/puppet/osnailyfacter/modular/logging/logging.pp b/deployment/puppet/osnailyfacter/modular/logging/logging.pp index f15c16c20d..5e5a236a6c 100644 --- a/deployment/puppet/osnailyfacter/modular/logging/logging.pp +++ b/deployment/puppet/osnailyfacter/modular/logging/logging.pp @@ -4,8 +4,6 @@ $base_syslog_hash = hiera('base_syslog_hash') $syslog_hash = hiera('syslog_hash') $use_syslog = hiera('use_syslog', true) $debug = pick($syslog_hash['debug'], hiera('debug', false)) -$nodes_hash = hiera('nodes', {}) -$roles = node_roles($nodes_hash, hiera('uid')) ################################################## @@ -38,7 +36,7 @@ if $use_syslog { } } - if member($roles, 'ironic') { + if roles_include(['ironic']) { $ironic_collector = true } diff --git a/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp b/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp index 2376ecb298..b7a2b912be 100644 --- a/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp +++ b/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp @@ -2,10 +2,8 @@ notice('MODULAR: ntp-client.pp') $management_vrouter_vip = hiera('management_vrouter_vip') $ntp_servers = hiera_array('ntp_servers', [$management_vrouter_vip]) -$nodes_hash = hiera('nodes', {}) -$roles = node_roles($nodes_hash, hiera('uid')) -if !(member($roles, 'controller') or member($roles, 'primary-controller')) { +if ! roles_include(['primary-controller', 'controller']) { class { 'ntp': servers => $ntp_servers, service_ensure => 'running', diff --git a/deployment/puppet/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp b/deployment/puppet/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp index a7444aa96f..f1b7843051 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp @@ -6,7 +6,6 @@ $cinder_hash = hiera_hash('cinder_hash', {}) $management_vip = hiera('management_vip') $queue_provider = hiera('queue_provider', 'rabbitmq') $cinder_volume_group = hiera('cinder_volume_group', 'cinder') -$nodes_hash = hiera('nodes', {}) $storage_hash = hiera_hash('storage', {}) $ceilometer_hash = hiera_hash('ceilometer_hash',{}) $sahara_hash = hiera_hash('sahara_hash',{}) @@ -17,7 +16,6 @@ $cinder_user_password = $cinder_hash[user_password] $keystone_user = pick($cinder_hash['user'], 'cinder') $keystone_tenant = pick($cinder_hash['tenant'], 'services') $region = hiera('region', 'RegionOne') -$roles = node_roles($nodes_hash, hiera('uid')) $ssl_hash = hiera_hash('use_ssl', {}) $primary_controller = hiera('primary_controller') @@ -50,7 +48,7 @@ $glance_ssl_usage = get_ssl_property($ssl_hash, {}, 'glance', 'internal', if $glance_ssl_usage { $glance_api_servers = "${glance_protocol}://${glance_endpoint}:9292" } else { - $glance_api_servers = hiera('glance_api_servers', "${management_vip}:9292") + $glance_api_servers = hiera('glance_api_servers', "${management_vip}:9292") } $service_port = '5000' @@ -60,7 +58,7 @@ $identity_uri = "${keystone_auth_protocol}://${keystone_auth_host}:${serv $privileged_auth_uri = "${keystone_auth_protocol}://${keystone_auth_host}:${service_port}/v2.0/" # Determine who should get the volume service -if (member($roles, 'cinder') and $storage_hash['volumes_lvm']) { +if roles_include(['cinder']) and $storage_hash['volumes_lvm'] { $manage_volumes = 'iscsi' } elsif ($storage_hash['volumes_ceph']) { $manage_volumes = 'ceph' diff --git a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp index e75438b61d..b9e50e7d7a 100644 --- a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp +++ b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp @@ -19,7 +19,6 @@ $syslog_log_facility_keystone = hiera('syslog_log_facility_keystone', 'LOG_LOCAL $management_vip = hiera('management_vip') $public_vip = hiera('public_vip') $sahara_hash = hiera_hash('sahara', {}) -$nodes_hash = hiera('nodes', {}) $mysql_hash = hiera_hash('mysql', {}) $access_hash = hiera_hash('access', {}) $keystone_hash = hiera_hash('keystone', {}) @@ -64,7 +63,6 @@ $ironic_hash = hiera_hash('ironic', {}) $memcached_server = hiera('memcached_addresses') $memcached_port = hiera('memcache_server_port', '11211') -$roles = node_roles($nodes_hash, hiera('uid')) $openstack_controller_hash = hiera_hash('openstack_controller', {}) $external_lb = hiera('external_lb', false) diff --git a/deployment/puppet/osnailyfacter/modular/roles/cinder.pp b/deployment/puppet/osnailyfacter/modular/roles/cinder.pp index 74bfdef5ef..abbffe2bf2 100644 --- a/deployment/puppet/osnailyfacter/modular/roles/cinder.pp +++ b/deployment/puppet/osnailyfacter/modular/roles/cinder.pp @@ -1,7 +1,8 @@ notice('MODULAR: cinder.pp') # Pulling hiera -$network_scheme = hiera_hash('network_scheme', {}) +$network_scheme = hiera_hash('network_scheme', {}) +$network_metadata = hiera_hash('network_metadata', {}) prepare_network_config($network_scheme) $cinder_hash = hiera_hash('cinder_hash', {}) @@ -15,7 +16,6 @@ $verbose = pick($cinder_hash['verbose'], true) $debug = pick($cinder_hash['debug'], hiera('debug', true)) $use_monit = false $auto_assign_floating_ip = hiera('auto_assign_floating_ip', false) -$nodes_hash = hiera('nodes', {}) $node_volumes = hiera('node_volumes', []) $storage_hash = hiera_hash('storage_hash', {}) $vcenter_hash = hiera('vcenter', {}) @@ -102,7 +102,7 @@ if $neutron_mellanox { $mellanox_mode = 'disabled' } -if (!empty(filter_nodes(hiera('nodes'), 'role', 'ceph-osd')) or +if (!empty(get_nodes_hash_by_roles($network_metadata, ['ceph-osd'])) or $storage_hash['volumes_ceph'] or $storage_hash['images_ceph'] or $storage_hash['objects_ceph'] @@ -140,12 +140,6 @@ $floating_hash = {} ##NO NEED TO CHANGE -$node = filter_nodes($nodes_hash, 'name', $::hostname) -if empty($node) { - fail("Node ${::hostname} is not defined in the hash structure") -} - -$roles = node_roles($nodes_hash, hiera('uid')) $mountpoints = filter_hash($mp_hash,'point') # SQLAlchemy backend configuration @@ -156,16 +150,16 @@ $idle_timeout = '3600' # Determine who should get the volume service -if (member($roles, 'cinder') and $storage_hash['volumes_lvm']) { +if (roles_include(['cinder']) and $storage_hash['volumes_lvm']) { $manage_volumes = 'iscsi' $physical_volumes = false -} elsif member($roles, 'cinder-vmware') { +} elsif roles_include(['cinder-vmware']) { $manage_volumes = 'vmdk' $physical_volumes = false } elsif ($storage_hash['volumes_ceph']) { $manage_volumes = 'ceph' $physical_volumes = false -} elsif (member($roles, 'cinder-block-device') and $storage_hash['volumes_block_device']) { +} elsif (roles_include(['cinder-block-device']) and $storage_hash['volumes_block_device']) { $manage_volumes = 'fake' $physical_volumes = join(get_disks_list_by_role($node_volumes, 'cinder-block-device'), ',') } else { @@ -188,7 +182,7 @@ if ($storage_hash['images_ceph']) { # NOTE(bogdando) for controller nodes running Corosync with Pacemaker # we delegate all of the monitor functions to RA instead of monit. -if member($roles, 'controller') or member($roles, 'primary-controller') { +if roles_include(['controller', 'primary-controller']) { $use_monit_real = false } else { $use_monit_real = $use_monit @@ -228,7 +222,7 @@ Exec { logoutput => true } ################################################################# # we need to evaluate ceph here, because ceph notifies/requires # other services that are declared in openstack manifests -if ($use_ceph and !$storage_hash['volumes_lvm'] and !member($roles, 'cinder-vmware')) { +if ($use_ceph and !$storage_hash['volumes_lvm'] and !roles_include(['cinder-vmware'])) { $primary_mons = $controllers $primary_mon = $controllers[0]['name'] @@ -243,8 +237,8 @@ if ($use_ceph and !$storage_hash['volumes_lvm'] and !member($roles, 'cinder-vmwa class {'::ceph': primary_mon => $primary_mon, - mon_hosts => nodes_with_roles($nodes_hash, ['primary-controller', 'controller', 'ceph-mon'], 'name'), - mon_ip_addresses => nodes_with_roles($nodes_hash, ['primary-controller', 'controller', 'ceph-mon'], 'internal_address'), + mon_hosts => nodes_with_roles(['primary-controller', 'controller', 'ceph-mon'], 'name'), + mon_ip_addresses => get_node_to_ipaddr_map_by_network_role(get_nodes_hash_by_roles($network_metadata, ['primary-controller', 'controller', 'ceph-mon']), 'mgmt/vip'), cluster_node_address => $public_vip, osd_pool_default_size => $storage_hash['osd_pool_size'], osd_pool_default_pg_num => $storage_hash['pg_num'], @@ -272,7 +266,7 @@ package { 'python-amqp': ensure => present } -if member($roles, 'controller') or member($roles, 'primary-controller') { +if roles_include(['controller', 'primary-controller']) { $bind_host = get_network_role_property('cinder/api', 'ipaddr') } else { $bind_host = false diff --git a/deployment/puppet/osnailyfacter/modular/roles/compute.pp b/deployment/puppet/osnailyfacter/modular/roles/compute.pp index 5c839785b6..dc609f5662 100644 --- a/deployment/puppet/osnailyfacter/modular/roles/compute.pp +++ b/deployment/puppet/osnailyfacter/modular/roles/compute.pp @@ -7,7 +7,6 @@ prepare_network_config($network_scheme) # Pulling hiera $compute_hash = hiera_hash('compute', {}) -$node_name = hiera('node_name') $public_int = hiera('public_int', undef) $public_vip = hiera('public_vip') $management_vip = hiera('management_vip') @@ -22,7 +21,6 @@ $verbose = pick($compute_hash['verbose'], true) $debug = pick($compute_hash['debug'], hiera('debug', true)) $use_monit = false $auto_assign_floating_ip = hiera('auto_assign_floating_ip', false) -$nodes_hash = hiera('nodes', {}) $storage_hash = hiera_hash('storage_hash', {}) $vcenter_hash = hiera('vcenter', {}) $nova_hash = hiera_hash('nova_hash', {}) @@ -125,8 +123,6 @@ $floating_hash = {} $memcached_server = hiera('memcached_addresses') $memcached_port = hiera('memcache_server_port', '11211') -##TODO: simply parse nodes array -$roles = $network_metadata['nodes'][$node_name]['node_roles'] $mountpoints = filter_hash($mp_hash,'point') # SQLAlchemy backend configuration @@ -143,9 +139,9 @@ if ($storage_hash['volumes_lvm']) { # Determine who should get the volume service -if (member($roles, 'cinder') and $storage_hash['volumes_lvm']) { +if (roles_include(['cinder']) and $storage_hash['volumes_lvm']) { $manage_volumes = 'iscsi' -} elsif (member($roles, 'cinder') and $storage_hash['volumes_vmdk']) { +} elsif (roles_include(['cinder']) and $storage_hash['volumes_vmdk']) { $manage_volumes = 'vmdk' } elsif ($storage_hash['volumes_ceph']) { $manage_volumes = 'ceph' @@ -174,14 +170,14 @@ if !($storage_hash['images_ceph'] and $storage_hash['objects_ceph']) and !$stora } # Get reserved host memory straight value if we've ceph neighbor -$r_hostmem = member($roles, 'ceph-osd') ? { +$r_hostmem = roles_include(['ceph-osd']) ? { true => min(max(floor($::memorysize_mb*0.2), 512), 1536), false => undef, } # NOTE(bogdando) for controller nodes running Corosync with Pacemaker # we delegate all of the monitor functions to RA instead of monit. -if member($roles, 'controller') or member($roles, 'primary-controller') { +if roles_include(['controller', 'primary-controller']) { $use_monit_real = false } else { $use_monit_real = $use_monit diff --git a/deployment/puppet/osnailyfacter/modular/vmware/cinder-vmware.pp b/deployment/puppet/osnailyfacter/modular/vmware/cinder-vmware.pp index 0f96eebe49..2c9fc428c9 100644 --- a/deployment/puppet/osnailyfacter/modular/vmware/cinder-vmware.pp +++ b/deployment/puppet/osnailyfacter/modular/vmware/cinder-vmware.pp @@ -1,10 +1,8 @@ notice('MODULAR: cinder-vmware.pp') -$nodes_hash = hiera('nodes', {}) -$roles = node_roles($nodes_hash, hiera('uid')) -$cinder_hash = hiera_hash('cinder_hash', {}) +$cinder_hash = hiera_hash('cinder_hash', {}) -if (member($roles, 'cinder-vmware')) { +if roles_include(['cinder-vmware']) { $debug = pick($cinder_hash['debug'], hiera('debug', true)) $volumes = get_cinder_vmware_data($cinder_hash['instances'], $debug) create_resources(vmware::cinder::vmdk, $volumes) diff --git a/deployment/puppet/osnailyfacter/spec/functions/get_node_key_name_spec.rb b/deployment/puppet/osnailyfacter/spec/functions/get_node_key_name_spec.rb new file mode 100644 index 0000000000..63cd08b126 --- /dev/null +++ b/deployment/puppet/osnailyfacter/spec/functions/get_node_key_name_spec.rb @@ -0,0 +1,22 @@ +require 'spec_helper' + +describe 'the get_node_key_name function' do + let(:scope) { PuppetlabsSpec::PuppetInternals.scope } + + it 'should exist' do + expect( + Puppet::Parser::Functions.function('get_node_key_name') + ).to eq('function_get_node_key_name') + end + + it 'should be able to calculate node key name' do + scope.stubs(:function_hiera).with(['uid']).returns('121') + expect(scope.function_get_node_key_name []).to eq 'node-121' + end + + it 'should raise error if UID not gived' do + scope.stubs(:function_hiera).with(['uid']).returns(nil) + expect{scope.function_get_node_key_name []}.to raise_error(Puppet::ParseError) + end + +end diff --git a/deployment/puppet/osnailyfacter/spec/functions/nodes_with_roles__spec.rb b/deployment/puppet/osnailyfacter/spec/functions/nodes_with_roles__spec.rb index 4a969ab33d..14b5de3e9b 100644 --- a/deployment/puppet/osnailyfacter/spec/functions/nodes_with_roles__spec.rb +++ b/deployment/puppet/osnailyfacter/spec/functions/nodes_with_roles__spec.rb @@ -1,55 +1,92 @@ +require 'yaml' require 'spec_helper' describe 'nodes_with_roles' do let(:scope) { PuppetlabsSpec::PuppetInternals.scope } + let(:network_metadata) do + < 1, - 'role' => 'role1', - }, - { - 'uid' => 2, - 'role' => 'role2', - }, - { - 'uid' => 3, - 'role' => 'role3', - } - ] - - scope.function_nodes_with_roles([ nodes, ['role1', 'role2'] ]).should == [ - { - 'uid' => 1, - 'role' => 'role1', - }, - { - 'uid' => 2, - 'role' => 'role2', - } - ] + expect(scope.function_nodes_with_roles([['role1', 'role2']])).to eq(YAML.load(''' + - + swift_zone: "1" + uid: "1" + fqdn: node-1.test.domain.local + user_node_name: Untitled (88:fc) + node_roles: + - role1 + - role2 + name: node-1 + - + swift_zone: "1" + uid: "2" + fqdn: node-2.test.domain.local + user_node_name: Untitled (88:fc) + node_roles: + - role2 + - role3 + name: node-2 + ''')) end - it 'should eliminate duplicate uids' do - nodes = [ - { - 'uid' => 1, - 'role' => 'role1', - }, - { - 'uid' => 1, - 'role' => 'role2', - }, - { - 'uid' => 2, - 'role' => 'role3', - } - ] - scope.function_nodes_with_roles([ nodes, ['role1', 'role2'], 'uid' ]).should == [1] + it 'should return array of nodes fqdn' do + expect(scope.function_nodes_with_roles([['role1', 'role2'], 'fqdn'])).to eq(['node-1.test.domain.local','node-2.test.domain.local']) end + end diff --git a/deployment/puppet/osnailyfacter/spec/functions/roles_include_spec.rb b/deployment/puppet/osnailyfacter/spec/functions/roles_include_spec.rb index 1e5b94b68b..189c7f899a 100644 --- a/deployment/puppet/osnailyfacter/spec/functions/roles_include_spec.rb +++ b/deployment/puppet/osnailyfacter/spec/functions/roles_include_spec.rb @@ -1,8 +1,79 @@ require 'spec_helper' +require 'yaml' describe 'the roles_include function' do + +let(:network_metadata) {""" +--- + nodes: + node-5: + swift_zone: '5' + uid: '5' + fqdn: node-5.domain.local + network_roles: + keystone/api: 10.88.0.6 + neutron/api: 10.88.0.6 + mgmt/database: 10.88.0.6 + mgmt/vip: 10.88.0.6 + sahara/api: 10.88.0.6 + nova/migration: 10.77.0.6 + user_node_name: CO22 + node_roles: + - compute + - cinder + name: node-5 + node-4: + swift_zone: '4' + uid: '4' + fqdn: node-4.domain.local + network_roles: + keystone/api: 10.88.0.7 + neutron/api: 10.88.0.7 + mgmt/database: 10.88.0.7 + mgmt/vip: 10.88.0.7 + sahara/api: 10.88.0.7 + heat/api: 10.88.0.7 + ceilometer/api: 10.88.0.7 + nova/migration: 10.77.0.7 + ex: 10.88.1.132 + user_node_name: CNT21 + node_roles: + - primary-controller + - controller + name: node-4 + node-6: + swift_zone: '6' + uid: '6' + fqdn: node-6.domain.local + network_roles: + keystone/api: 10.88.0.8 + neutron/api: 10.88.0.8 + mgmt/database: 10.88.0.8 + sahara/api: 10.88.0.8 + ceilometer/api: 10.88.0.8 + mgmt/vip: 10.88.0.8 + nova/migration: 10.77.0.8 + user_node_name: CO23 + node_roles: + - compute + - cinder + name: node-6 +"""} + let(:scope) { PuppetlabsSpec::PuppetInternals.scope } + before(:each) do + puppet_debug_override() + end + + before(:each) do + scope.stubs(:function_hiera_hash).with(['network_metadata']).returns(YAML.load(network_metadata)) + end + + before(:each) do + scope.stubs(:function_get_node_key_name).with([]).returns('node-4') + end + it 'should exist' do expect( Puppet::Parser::Functions.function('roles_include') @@ -15,27 +86,8 @@ describe 'the roles_include function' do }.to raise_error /Wrong number of arguments/ end - before(:each) do - scope.stubs(:function_hiera).with(['nodes']).returns( - [ - { - 'uid' => '1', - 'role' => 'controller', - }, - { - 'uid' => '2', - 'role' => 'compute', - }, - { - 'uid' => '2', - 'role' => 'ceph', - }, - ] - ) - end it 'should be able to find a matching role' do - scope.stubs(:function_hiera).with(['uid']).returns('1') expect( scope.function_roles_include [ 'controller' ] ).to eq true @@ -45,13 +97,11 @@ describe 'the roles_include function' do end it 'should be able to find a non-matching role' do - scope.stubs(:function_hiera).with(['uid']).returns('1') expect( scope.function_roles_include [ 'compute' ] ).to eq false - scope.stubs(:function_hiera).with(['uid']).returns('2') expect( - scope.function_roles_include [ 'controller' ] + scope.function_roles_include [ %w(compute cinder) ] ).to eq false end diff --git a/deployment/puppet/osnailyfacter/templates/globals_yaml.erb b/deployment/puppet/osnailyfacter/templates/globals_yaml.erb index 3f03403729..c65f2606ac 100644 --- a/deployment/puppet/osnailyfacter/templates/globals_yaml.erb +++ b/deployment/puppet/osnailyfacter/templates/globals_yaml.erb @@ -58,8 +58,7 @@ <% globals.store "neutron_metadata_proxy_secret", @neutron_metadata_proxy_secret -%> <% globals.store "neutron_nodes", @neutron_nodes -%> <% globals.store "neutron_user_password", @neutron_user_password -%> -<% globals.store "node", @node -%> -<% globals.store "nodes_hash", @nodes_hash -%> +<% globals.store "node_hash", @node_hash -%> <% globals.store "nova_db_password", @nova_db_password -%> <% globals.store "nova_hash", @real_nova_hash -%> <% globals.store "nova_rate_limits", @nova_rate_limits -%> diff --git a/tests/noop/astute.yaml/neut_gre.generate_vms.yaml b/tests/noop/astute.yaml/neut_gre.generate_vms.yaml index d0b5562e40..f8fd418b91 100644 --- a/tests/noop/astute.yaml/neut_gre.generate_vms.yaml +++ b/tests/noop/astute.yaml/neut_gre.generate_vms.yaml @@ -496,75 +496,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-118.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-118 - role: cinder - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '118' - uid: '118' - user_node_name: Untitled (1d:4b) -- fqdn: node-128.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-128 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: compute - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '128' - uid: '128' - user_node_name: Untitled (6f:9d) -- fqdn: node-128.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-128 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: virt - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '128' - uid: '128' - user_node_name: Untitled (6f:9d) -- fqdn: node-129.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-129 - public_address: 172.16.0.3 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '129' - uid: '129' - user_node_name: Untitled (74:27) -- fqdn: node-131.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-131 - public_address: 172.16.0.4 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '131' - uid: '131' - user_node_name: Untitled (34:45) -- fqdn: node-132.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-132 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '132' - uid: '132' - user_node_name: Untitled (18:c9) nova: db_password: mqnsUMgC state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml b/tests/noop/astute.yaml/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml index 0931e6f450..112369f67c 100644 --- a/tests/noop/astute.yaml/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml +++ b/tests/noop/astute.yaml/neut_vlan.ceph.ceil-compute.overridden_ssl.yaml @@ -658,59 +658,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-121.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-121 - role: primary-mongo - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '121' - uid: '121' - user_node_name: Untitled (18:c9) -- fqdn: node-124.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-124 - role: ceph-osd - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '124' - uid: '124' - user_node_name: Untitled (6f:9d) -- fqdn: node-125.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-125 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '125' - uid: '125' - user_node_name: Untitled (34:45) -- fqdn: node-126.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-126 - role: ceph-osd - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '126' - uid: '126' - user_node_name: Untitled (12:ea) -- fqdn: node-127.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-127 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '127' - uid: '127' - user_node_name: Untitled (74:27) nova: db_password: VXcP6cIR state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml b/tests/noop/astute.yaml/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml index d952d541f9..201171ec01 100644 --- a/tests/noop/astute.yaml/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml +++ b/tests/noop/astute.yaml/neut_vlan.ceph.ceil-primary-controller.overridden_ssl.yaml @@ -678,59 +678,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-121.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-121 - role: primary-mongo - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '121' - uid: '121' - user_node_name: Untitled (18:c9) -- fqdn: node-124.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-124 - role: ceph-osd - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '124' - uid: '124' - user_node_name: Untitled (6f:9d) -- fqdn: node-125.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-125 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '125' - uid: '125' - user_node_name: Untitled (34:45) -- fqdn: node-126.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-126 - role: ceph-osd - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '126' - uid: '126' - user_node_name: Untitled (12:ea) -- fqdn: node-127.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-127 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '127' - uid: '127' - user_node_name: Untitled (74:27) nova: db_password: VXcP6cIR state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vlan.ceph.compute-ephemeral-ceph.yaml b/tests/noop/astute.yaml/neut_vlan.ceph.compute-ephemeral-ceph.yaml index f22a7ef6cf..31b164da28 100644 --- a/tests/noop/astute.yaml/neut_vlan.ceph.compute-ephemeral-ceph.yaml +++ b/tests/noop/astute.yaml/neut_vlan.ceph.compute-ephemeral-ceph.yaml @@ -288,71 +288,6 @@ online: true keystone: db_password: 0WzSQMdU admin_token: n7tfrNvt -nodes: -- user_node_name: Untitled (2c:5e) - uid: '1' - public_address: 10.122.11.4 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.local - role: ceph-osd - public_netmask: 255.255.255.0 - internal_address: 10.122.12.3 - storage_address: 10.122.14.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (2c:5e) - uid: '1' - public_address: 10.122.11.4 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.local - role: primary-controller - public_netmask: 255.255.255.0 - internal_address: 10.122.12.3 - storage_address: 10.122.14.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (e5:e6) - uid: '2' - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.local - role: ceph-osd - internal_address: 10.122.12.6 - storage_address: 10.122.14.2 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (e5:e6) - uid: '2' - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.local - role: compute - internal_address: 10.122.12.6 - storage_address: 10.122.14.2 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (50:1e) - uid: '3' - internal_netmask: 255.255.255.0 - fqdn: node-3.domain.local - role: ceph-osd - internal_address: 10.122.12.4 - storage_address: 10.122.14.4 - swift_zone: '3' - storage_netmask: 255.255.255.0 - name: node-3 -- user_node_name: Untitled (cb:23) - uid: '4' - internal_netmask: 255.255.255.0 - fqdn: node-4.domain.local - role: cinder - internal_address: 10.122.12.5 - storage_address: 10.122.14.3 - swift_zone: '4' - storage_netmask: 255.255.255.0 - name: node-4 nova_quota: false public: network_role: public/vip diff --git a/tests/noop/astute.yaml/neut_vlan.ceph.controller-ephemeral-ceph.yaml b/tests/noop/astute.yaml/neut_vlan.ceph.controller-ephemeral-ceph.yaml index 6b9addae3c..b3a029f06d 100644 --- a/tests/noop/astute.yaml/neut_vlan.ceph.controller-ephemeral-ceph.yaml +++ b/tests/noop/astute.yaml/neut_vlan.ceph.controller-ephemeral-ceph.yaml @@ -728,61 +728,6 @@ online: true keystone: db_password: 0WzSQMdU admin_token: n7tfrNvt -nodes: -- user_node_name: Untitled (2c:5e) - uid: '1' - public_address: 10.122.11.4 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.local - role: ceph-osd - public_netmask: 255.255.255.0 - internal_address: 10.122.12.3 - storage_address: 10.122.14.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (2c:5e) - uid: '1' - public_address: 10.122.11.4 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.local - role: primary-controller - public_netmask: 255.255.255.0 - internal_address: 10.122.12.3 - storage_address: 10.122.14.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (e5:e6) - uid: '2' - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.local - role: compute - internal_address: 10.122.12.6 - storage_address: 10.122.14.2 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (50:1e) - uid: '3' - internal_netmask: 255.255.255.0 - fqdn: node-3.domain.local - role: ceph-osd - internal_address: 10.122.12.4 - storage_address: 10.122.14.4 - swift_zone: '3' - storage_netmask: 255.255.255.0 - name: node-3 -- user_node_name: Untitled (cb:23) - uid: '4' - internal_netmask: 255.255.255.0 - fqdn: node-4.domain.local - role: cinder - internal_address: 10.122.12.5 - storage_address: 10.122.14.3 - swift_zone: '4' - storage_netmask: 255.255.255.0 - name: node-4 nova_quota: false public: network_role: public/vip diff --git a/tests/noop/astute.yaml/neut_vlan.cinder-block-device.compute.yaml b/tests/noop/astute.yaml/neut_vlan.cinder-block-device.compute.yaml index fb959d7dc7..a0b08f7324 100644 --- a/tests/noop/astute.yaml/neut_vlan.cinder-block-device.compute.yaml +++ b/tests/noop/astute.yaml/neut_vlan.cinder-block-device.compute.yaml @@ -46,7 +46,7 @@ quantum_settings: phys_nets: physnet1: bridge: br-floating - vlan_range: + vlan_range: base_mac: fa:16:3e:00:00:00 segmentation_type: tun tunnel_id_ranges: 2:65535 @@ -57,7 +57,7 @@ quantum_settings: network_type: flat router_ext: true physnet: physnet1 - segment_id: + segment_id: L3: nameservers: [] subnet: 172.18.79.128/25 @@ -71,14 +71,14 @@ quantum_settings: L2: network_type: tun router_ext: false - physnet: - segment_id: + physnet: + segment_id: L3: nameservers: - 8.8.4.4 - 8.8.8.8 subnet: 192.168.111.0/24 - floating: + floating: gateway: 192.168.111.1 enable_dhcp: true tenant: admin @@ -184,91 +184,6 @@ online: true keystone: db_password: sXRhztIaxf8nc8D4qusUXNPn admin_token: q8syV6A6XabiEytUWTBQJYmV -nodes: -- user_node_name: Untitled (34:24) - uid: '1' - public_address: 172.18.79.164 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.tld - role: primary-controller - public_netmask: 255.255.255.128 - internal_address: 192.168.0.3 - storage_address: 192.168.1.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (79:d2) - uid: '2' - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.tld - role: cinder-block-device - internal_address: 192.168.0.7 - storage_address: 192.168.1.3 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (79:d2) - uid: '2' - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.tld - role: compute - internal_address: 192.168.0.7 - storage_address: 192.168.1.3 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (93:70) - uid: '3' - public_address: 172.18.79.163 - internal_netmask: 255.255.255.0 - fqdn: node-3.domain.tld - role: controller - public_netmask: 255.255.255.128 - internal_address: 192.168.0.6 - storage_address: 192.168.1.5 - swift_zone: '3' - storage_netmask: 255.255.255.0 - name: node-3 -- user_node_name: Untitled (4b:d2) - uid: '8' - internal_netmask: 255.255.255.0 - fqdn: node-8.domain.tld - role: cinder-block-device - internal_address: 192.168.0.5 - storage_address: 192.168.1.4 - swift_zone: '8' - storage_netmask: 255.255.255.0 - name: node-8 -- user_node_name: Untitled (4b:d2) - uid: '8' - internal_netmask: 255.255.255.0 - fqdn: node-8.domain.tld - role: compute - internal_address: 192.168.0.5 - storage_address: 192.168.1.4 - swift_zone: '8' - storage_netmask: 255.255.255.0 - name: node-8 -- user_node_name: Untitled (3c:7b) - uid: '9' - internal_netmask: 255.255.255.0 - fqdn: node-9.domain.tld - role: cinder-block-device - internal_address: 192.168.0.4 - storage_address: 192.168.1.2 - swift_zone: '9' - storage_netmask: 255.255.255.0 - name: node-9 -- user_node_name: Untitled (3c:7b) - uid: '9' - internal_netmask: 255.255.255.0 - fqdn: node-9.domain.tld - role: compute - internal_address: 192.168.0.4 - storage_address: 192.168.1.2 - swift_zone: '9' - storage_netmask: 255.255.255.0 - name: node-9 nova_quota: false ceilometer: db_password: 5dmTkWROJj6xYxhn3UMCyZad @@ -305,19 +220,19 @@ repo_setup: - name: ubuntu section: main universe multiverse uri: http://archive.ubuntu.com/ubuntu/ - priority: + priority: suite: trusty type: deb - name: ubuntu-updates section: main universe multiverse uri: http://archive.ubuntu.com/ubuntu/ - priority: + priority: suite: trusty-updates type: deb - name: ubuntu-security section: main universe multiverse uri: http://archive.ubuntu.com/ubuntu/ - priority: + priority: suite: trusty-security type: deb - name: mos @@ -387,8 +302,8 @@ network_metadata: neutron/mesh: 192.168.2.4 admin/pxe: 10.20.0.9 mongo/db: 192.168.0.4 - neutron/private: - neutron/floating: + neutron/private: + neutron/floating: fw-admin: 10.20.0.9 glance/api: 192.168.0.4 heat/api: 192.168.0.4 @@ -429,8 +344,8 @@ network_metadata: neutron/mesh: 192.168.2.5 admin/pxe: 10.20.0.4 mongo/db: 192.168.0.3 - neutron/private: - neutron/floating: + neutron/private: + neutron/floating: fw-admin: 10.20.0.4 glance/api: 192.168.0.3 heat/api: 192.168.0.3 @@ -467,8 +382,8 @@ network_metadata: neutron/mesh: 192.168.2.2 admin/pxe: 10.20.0.8 mongo/db: 192.168.0.5 - neutron/private: - neutron/floating: + neutron/private: + neutron/floating: fw-admin: 10.20.0.8 glance/api: 192.168.0.5 heat/api: 192.168.0.5 @@ -509,8 +424,8 @@ network_metadata: neutron/mesh: 192.168.2.1 admin/pxe: 10.20.0.7 mongo/db: 192.168.0.6 - neutron/private: - neutron/floating: + neutron/private: + neutron/floating: fw-admin: 10.20.0.7 glance/api: 192.168.0.6 heat/api: 192.168.0.6 @@ -547,8 +462,8 @@ network_metadata: neutron/mesh: 192.168.2.3 admin/pxe: 10.20.0.10 mongo/db: 192.168.0.7 - neutron/private: - neutron/floating: + neutron/private: + neutron/floating: fw-admin: 10.20.0.10 glance/api: 192.168.0.7 heat/api: 192.168.0.7 @@ -866,6 +781,6 @@ kernel_params: group: general weight: 40 label: Kernel parameters -openstack_version_prev: +openstack_version_prev: quantum: true use_neutron: true diff --git a/tests/noop/astute.yaml/neut_vlan.compute.nossl.yaml b/tests/noop/astute.yaml/neut_vlan.compute.nossl.yaml index 94aa63f5c8..cc5468cd4e 100644 --- a/tests/noop/astute.yaml/neut_vlan.compute.nossl.yaml +++ b/tests/noop/astute.yaml/neut_vlan.compute.nossl.yaml @@ -288,99 +288,6 @@ online: true keystone: db_password: H4N630IH admin_token: cKHHVACg -nodes: -- user_node_name: Untitled (d8:bb) - uid: '1' - public_address: 10.122.6.2 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.local - role: cinder - public_netmask: 255.255.255.0 - internal_address: 10.122.7.1 - storage_address: 10.122.9.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (d8:bb) - uid: '1' - public_address: 10.122.6.2 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.local - role: primary-controller - public_netmask: 255.255.255.0 - internal_address: 10.122.7.1 - storage_address: 10.122.9.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (68:63) - uid: '2' - public_address: 10.122.6.4 - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.local - role: cinder - public_netmask: 255.255.255.0 - internal_address: 10.122.7.4 - storage_address: 10.122.9.3 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (68:63) - uid: '2' - public_address: 10.122.6.4 - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.local - role: controller - public_netmask: 255.255.255.0 - internal_address: 10.122.7.4 - storage_address: 10.122.9.3 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (03:15) - uid: '3' - public_address: 10.122.6.3 - internal_netmask: 255.255.255.0 - fqdn: node-3.domain.local - role: cinder - public_netmask: 255.255.255.0 - internal_address: 10.122.7.5 - storage_address: 10.122.9.2 - swift_zone: '3' - storage_netmask: 255.255.255.0 - name: node-3 -- user_node_name: Untitled (03:15) - uid: '3' - public_address: 10.122.6.3 - internal_netmask: 255.255.255.0 - fqdn: node-3.domain.local - role: controller - public_netmask: 255.255.255.0 - internal_address: 10.122.7.5 - storage_address: 10.122.9.2 - swift_zone: '3' - storage_netmask: 255.255.255.0 - name: node-3 -- user_node_name: Untitled (a7:46) - uid: '4' - internal_netmask: 255.255.255.0 - fqdn: node-4.domain.local - role: compute - internal_address: 10.122.7.2 - storage_address: 10.122.9.5 - swift_zone: '4' - storage_netmask: 255.255.255.0 - name: node-4 -- user_node_name: Untitled (2a:ee) - uid: '5' - internal_netmask: 255.255.255.0 - fqdn: node-5.domain.local - role: compute - internal_address: 10.122.7.3 - storage_address: 10.122.9.4 - swift_zone: '5' - storage_netmask: 255.255.255.0 - name: node-5 nova_quota: false public: network_role: public/vip diff --git a/tests/noop/astute.yaml/neut_vlan.compute.ssl.overridden.yaml b/tests/noop/astute.yaml/neut_vlan.compute.ssl.overridden.yaml index 12b87ff585..bc61dc4ce1 100644 --- a/tests/noop/astute.yaml/neut_vlan.compute.ssl.overridden.yaml +++ b/tests/noop/astute.yaml/neut_vlan.compute.ssl.overridden.yaml @@ -288,99 +288,6 @@ online: true keystone: db_password: H4N630IH admin_token: cKHHVACg -nodes: -- user_node_name: Untitled (d8:bb) - uid: '1' - public_address: 10.122.6.2 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.local - role: cinder - public_netmask: 255.255.255.0 - internal_address: 10.122.7.1 - storage_address: 10.122.9.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (d8:bb) - uid: '1' - public_address: 10.122.6.2 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.local - role: primary-controller - public_netmask: 255.255.255.0 - internal_address: 10.122.7.1 - storage_address: 10.122.9.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (68:63) - uid: '2' - public_address: 10.122.6.4 - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.local - role: cinder - public_netmask: 255.255.255.0 - internal_address: 10.122.7.4 - storage_address: 10.122.9.3 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (68:63) - uid: '2' - public_address: 10.122.6.4 - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.local - role: controller - public_netmask: 255.255.255.0 - internal_address: 10.122.7.4 - storage_address: 10.122.9.3 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (03:15) - uid: '3' - public_address: 10.122.6.3 - internal_netmask: 255.255.255.0 - fqdn: node-3.domain.local - role: cinder - public_netmask: 255.255.255.0 - internal_address: 10.122.7.5 - storage_address: 10.122.9.2 - swift_zone: '3' - storage_netmask: 255.255.255.0 - name: node-3 -- user_node_name: Untitled (03:15) - uid: '3' - public_address: 10.122.6.3 - internal_netmask: 255.255.255.0 - fqdn: node-3.domain.local - role: controller - public_netmask: 255.255.255.0 - internal_address: 10.122.7.5 - storage_address: 10.122.9.2 - swift_zone: '3' - storage_netmask: 255.255.255.0 - name: node-3 -- user_node_name: Untitled (a7:46) - uid: '4' - internal_netmask: 255.255.255.0 - fqdn: node-4.domain.local - role: compute - internal_address: 10.122.7.2 - storage_address: 10.122.9.5 - swift_zone: '4' - storage_netmask: 255.255.255.0 - name: node-4 -- user_node_name: Untitled (2a:ee) - uid: '5' - internal_netmask: 255.255.255.0 - fqdn: node-5.domain.local - role: compute - internal_address: 10.122.7.3 - storage_address: 10.122.9.4 - swift_zone: '5' - storage_netmask: 255.255.255.0 - name: node-5 nova_quota: false public: network_role: public/vip diff --git a/tests/noop/astute.yaml/neut_vlan.compute.ssl.yaml b/tests/noop/astute.yaml/neut_vlan.compute.ssl.yaml index 390dfab2c6..9c94712b75 100644 --- a/tests/noop/astute.yaml/neut_vlan.compute.ssl.yaml +++ b/tests/noop/astute.yaml/neut_vlan.compute.ssl.yaml @@ -288,99 +288,6 @@ online: true keystone: db_password: H4N630IH admin_token: cKHHVACg -nodes: -- user_node_name: Untitled (d8:bb) - uid: '1' - public_address: 10.122.6.2 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.local - role: cinder - public_netmask: 255.255.255.0 - internal_address: 10.122.7.1 - storage_address: 10.122.9.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (d8:bb) - uid: '1' - public_address: 10.122.6.2 - internal_netmask: 255.255.255.0 - fqdn: node-1.domain.local - role: primary-controller - public_netmask: 255.255.255.0 - internal_address: 10.122.7.1 - storage_address: 10.122.9.1 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (68:63) - uid: '2' - public_address: 10.122.6.4 - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.local - role: cinder - public_netmask: 255.255.255.0 - internal_address: 10.122.7.4 - storage_address: 10.122.9.3 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (68:63) - uid: '2' - public_address: 10.122.6.4 - internal_netmask: 255.255.255.0 - fqdn: node-2.domain.local - role: controller - public_netmask: 255.255.255.0 - internal_address: 10.122.7.4 - storage_address: 10.122.9.3 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 -- user_node_name: Untitled (03:15) - uid: '3' - public_address: 10.122.6.3 - internal_netmask: 255.255.255.0 - fqdn: node-3.domain.local - role: cinder - public_netmask: 255.255.255.0 - internal_address: 10.122.7.5 - storage_address: 10.122.9.2 - swift_zone: '3' - storage_netmask: 255.255.255.0 - name: node-3 -- user_node_name: Untitled (03:15) - uid: '3' - public_address: 10.122.6.3 - internal_netmask: 255.255.255.0 - fqdn: node-3.domain.local - role: controller - public_netmask: 255.255.255.0 - internal_address: 10.122.7.5 - storage_address: 10.122.9.2 - swift_zone: '3' - storage_netmask: 255.255.255.0 - name: node-3 -- user_node_name: Untitled (a7:46) - uid: '4' - internal_netmask: 255.255.255.0 - fqdn: node-4.domain.local - role: compute - internal_address: 10.122.7.2 - storage_address: 10.122.9.5 - swift_zone: '4' - storage_netmask: 255.255.255.0 - name: node-4 -- user_node_name: Untitled (2a:ee) - uid: '5' - internal_netmask: 255.255.255.0 - fqdn: node-5.domain.local - role: compute - internal_address: 10.122.7.3 - storage_address: 10.122.9.4 - swift_zone: '5' - storage_netmask: 255.255.255.0 - name: node-5 nova_quota: false public: network_role: public/vip diff --git a/tests/noop/astute.yaml/neut_vlan.ironic.conductor.yaml b/tests/noop/astute.yaml/neut_vlan.ironic.conductor.yaml index 1ab855fb92..d517c074e9 100644 --- a/tests/noop/astute.yaml/neut_vlan.ironic.conductor.yaml +++ b/tests/noop/astute.yaml/neut_vlan.ironic.conductor.yaml @@ -298,29 +298,6 @@ online: true keystone: db_password: xl0tg0dvg80jNMGvBfb83YSn admin_token: fEba1VO69rCHVWjM61sZ4Q5x -nodes: -- user_node_name: Untitled (cc:a5) - uid: '1' - public_address: 172.16.51.117 - internal_netmask: 255.255.255.0 - fqdn: node-1.test.domain.local - role: primary-controller - public_netmask: 255.255.255.240 - internal_address: 192.168.0.3 - storage_address: 192.168.1.2 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (6c:19) - uid: '2' - internal_netmask: 255.255.255.0 - fqdn: node-2.test.domain.local - role: ironic - internal_address: 192.168.0.4 - storage_address: 192.168.1.1 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 nova_quota: false ceilometer: db_password: KEOghUJZJKLV5LdUnxjQqu1V diff --git a/tests/noop/astute.yaml/neut_vlan.ironic.controller.yaml b/tests/noop/astute.yaml/neut_vlan.ironic.controller.yaml index 14827717b8..3b65e98e95 100644 --- a/tests/noop/astute.yaml/neut_vlan.ironic.controller.yaml +++ b/tests/noop/astute.yaml/neut_vlan.ironic.controller.yaml @@ -793,29 +793,6 @@ online: true keystone: db_password: xl0tg0dvg80jNMGvBfb83YSn admin_token: fEba1VO69rCHVWjM61sZ4Q5x -nodes: -- user_node_name: Untitled (cc:a5) - uid: '1' - public_address: 172.16.51.117 - internal_netmask: 255.255.255.0 - fqdn: node-1.test.domain.local - role: primary-controller - public_netmask: 255.255.255.240 - internal_address: 192.168.0.3 - storage_address: 192.168.1.2 - swift_zone: '1' - storage_netmask: 255.255.255.0 - name: node-1 -- user_node_name: Untitled (6c:19) - uid: '2' - internal_netmask: 255.255.255.0 - fqdn: node-2.test.domain.local - role: ironic - internal_address: 192.168.0.4 - storage_address: 192.168.1.1 - swift_zone: '2' - storage_netmask: 255.255.255.0 - name: node-2 nova_quota: false ceilometer: db_password: KEOghUJZJKLV5LdUnxjQqu1V diff --git a/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml b/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml index 7bf0c9f0ff..76bbc146f8 100644 --- a/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml +++ b/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-ceph-osd.yaml @@ -481,59 +481,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-121.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-121 - role: primary-mongo - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '121' - uid: '121' - user_node_name: Untitled (18:c9) -- fqdn: node-124.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-124 - role: ceph-osd - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '124' - uid: '124' - user_node_name: Untitled (6f:9d) -- fqdn: node-125.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-125 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '125' - uid: '125' - user_node_name: Untitled (34:45) -- fqdn: node-126.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-126 - role: ceph-osd - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '126' - uid: '126' - user_node_name: Untitled (12:ea) -- fqdn: node-127.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-127 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '127' - uid: '127' - user_node_name: Untitled (74:27) nova: db_password: VXcP6cIR state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-compute.yaml b/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-compute.yaml index 6de7a348c8..e03c11333a 100644 --- a/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-compute.yaml +++ b/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-compute.yaml @@ -482,59 +482,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-121.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-121 - role: primary-mongo - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '121' - uid: '121' - user_node_name: Untitled (18:c9) -- fqdn: node-124.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-124 - role: ceph-osd - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '124' - uid: '124' - user_node_name: Untitled (6f:9d) -- fqdn: node-125.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-125 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '125' - uid: '125' - user_node_name: Untitled (34:45) -- fqdn: node-126.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-126 - role: ceph-osd - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '126' - uid: '126' - user_node_name: Untitled (12:ea) -- fqdn: node-127.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-127 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '127' - uid: '127' - user_node_name: Untitled (74:27) nova: db_password: VXcP6cIR state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-controller.yaml b/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-controller.yaml index 7f8297ef66..aec38afed8 100644 --- a/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-controller.yaml +++ b/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-controller.yaml @@ -543,71 +543,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-121.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-121 - role: primary-mongo - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '121' - uid: '121' - user_node_name: Untitled (18:c9) -- fqdn: node-124.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-124 - role: ceph-osd - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '124' - uid: '124' - user_node_name: Untitled (6f:9d) -- fqdn: node-125.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-125 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '125' - uid: '125' - user_node_name: Untitled (34:45) -- fqdn: node-126.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-126 - role: ceph-osd - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '126' - uid: '126' - user_node_name: Untitled (12:ea) -- fqdn: node-127.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-127 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '127' - uid: '127' - user_node_name: Untitled (74:27) -- fqdn: node-128.test.domain.local - internal_address: 192.168.0.8 - internal_netmask: 255.255.255.0 - name: node-128 - public_address: 172.16.0.8 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.8 - storage_netmask: 255.255.255.0 - swift_zone: '128' - uid: '128' - user_node_name: Untitled (56:67) nova: db_password: VXcP6cIR state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml b/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml index 40c6cc32b9..fb06da2e3e 100644 --- a/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml +++ b/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-primary-controller.yaml @@ -543,71 +543,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-121.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-121 - role: primary-mongo - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '121' - uid: '121' - user_node_name: Untitled (18:c9) -- fqdn: node-124.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-124 - role: ceph-osd - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '124' - uid: '124' - user_node_name: Untitled (6f:9d) -- fqdn: node-125.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-125 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '125' - uid: '125' - user_node_name: Untitled (34:45) -- fqdn: node-126.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-126 - role: ceph-osd - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '126' - uid: '126' - user_node_name: Untitled (12:ea) -- fqdn: node-127.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-127 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '127' - uid: '127' - user_node_name: Untitled (74:27) -- fqdn: node-128.test.domain.local - internal_address: 192.168.0.8 - internal_netmask: 255.255.255.0 - name: node-128 - public_address: 172.16.0.8 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.8 - storage_netmask: 255.255.255.0 - swift_zone: '128' - uid: '128' - user_node_name: Untitled (56:67) nova: db_password: VXcP6cIR state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml b/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml index 4bf57a838a..42ba647a29 100644 --- a/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml +++ b/tests/noop/astute.yaml/neut_vlan_l3ha.ceph.ceil-primary-mongo.yaml @@ -482,59 +482,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-121.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-121 - role: primary-mongo - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '121' - uid: '121' - user_node_name: Untitled (18:c9) -- fqdn: node-124.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-124 - role: ceph-osd - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '124' - uid: '124' - user_node_name: Untitled (6f:9d) -- fqdn: node-125.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-125 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '125' - uid: '125' - user_node_name: Untitled (34:45) -- fqdn: node-126.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-126 - role: ceph-osd - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '126' - uid: '126' - user_node_name: Untitled (12:ea) -- fqdn: node-127.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-127 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '127' - uid: '127' - user_node_name: Untitled (74:27) nova: db_password: VXcP6cIR state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-cinder.yaml b/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-cinder.yaml index 148b1b5b7e..406c20027e 100644 --- a/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-cinder.yaml +++ b/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-cinder.yaml @@ -469,63 +469,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-118.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-118 - role: cinder - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '118' - uid: '118' - user_node_name: Untitled (1d:4b) -- fqdn: node-128.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-128 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '128' - uid: '128' - user_node_name: Untitled (6f:9d) -- fqdn: node-129.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-129 - public_address: 172.16.0.3 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '129' - uid: '129' - user_node_name: Untitled (74:27) -- fqdn: node-131.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-131 - public_address: 172.16.0.4 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '131' - uid: '131' - user_node_name: Untitled (34:45) -- fqdn: node-132.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-132 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '132' - uid: '132' - user_node_name: Untitled (18:c9) nova: db_password: mqnsUMgC state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-compute.yaml b/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-compute.yaml index 87f01224e6..00797d2984 100644 --- a/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-compute.yaml +++ b/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-compute.yaml @@ -489,63 +489,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-118.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-118 - role: cinder - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '118' - uid: '118' - user_node_name: Untitled (1d:4b) -- fqdn: node-128.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-128 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '128' - uid: '128' - user_node_name: Untitled (6f:9d) -- fqdn: node-129.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-129 - public_address: 172.16.0.3 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '129' - uid: '129' - user_node_name: Untitled (74:27) -- fqdn: node-131.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-131 - public_address: 172.16.0.4 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '131' - uid: '131' - user_node_name: Untitled (34:45) -- fqdn: node-132.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-132 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '132' - uid: '132' - user_node_name: Untitled (18:c9) nova: db_password: mqnsUMgC state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-controller.yaml b/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-controller.yaml index 8931f9ca2f..fc3a85f065 100644 --- a/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-controller.yaml +++ b/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-controller.yaml @@ -490,63 +490,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-118.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-118 - role: cinder - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '118' - uid: '118' - user_node_name: Untitled (1d:4b) -- fqdn: node-128.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-128 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '128' - uid: '128' - user_node_name: Untitled (6f:9d) -- fqdn: node-129.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-129 - public_address: 172.16.0.3 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '129' - uid: '129' - user_node_name: Untitled (74:27) -- fqdn: node-131.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-131 - public_address: 172.16.0.4 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '131' - uid: '131' - user_node_name: Untitled (34:45) -- fqdn: node-132.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-132 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '132' - uid: '132' - user_node_name: Untitled (18:c9) nova: db_password: mqnsUMgC state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-primary-controller.overridden_ssl.yaml b/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-primary-controller.overridden_ssl.yaml index 9c097a4354..93af81ba10 100644 --- a/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-primary-controller.overridden_ssl.yaml +++ b/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-primary-controller.overridden_ssl.yaml @@ -674,63 +674,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-118.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-118 - role: cinder - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '118' - uid: '118' - user_node_name: Untitled (1d:4b) -- fqdn: node-128.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-128 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '128' - uid: '128' - user_node_name: Untitled (6f:9d) -- fqdn: node-129.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-129 - public_address: 172.16.0.3 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '129' - uid: '129' - user_node_name: Untitled (74:27) -- fqdn: node-131.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-131 - public_address: 172.16.0.4 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '131' - uid: '131' - user_node_name: Untitled (34:45) -- fqdn: node-132.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-132 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '132' - uid: '132' - user_node_name: Untitled (18:c9) nova: db_password: mqnsUMgC state_path: /var/lib/nova diff --git a/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-primary-controller.yaml b/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-primary-controller.yaml index 7e407822f4..1e03e43513 100644 --- a/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-primary-controller.yaml +++ b/tests/noop/astute.yaml/neut_vxlan_dvr.murano.sahara-primary-controller.yaml @@ -498,63 +498,6 @@ neutron_mellanox: weight: 50 plugin: disabled vf_num: '16' -nodes: -- fqdn: node-118.test.domain.local - internal_address: 192.168.0.1 - internal_netmask: 255.255.255.0 - name: node-118 - role: cinder - storage_address: 192.168.1.1 - storage_netmask: 255.255.255.0 - swift_zone: '118' - uid: '118' - user_node_name: Untitled (1d:4b) -- fqdn: node-128.test.domain.local - internal_address: 192.168.0.2 - internal_netmask: 255.255.255.0 - name: node-128 - public_address: 172.16.0.2 - public_netmask: 255.255.255.0 - role: primary-controller - storage_address: 192.168.1.2 - storage_netmask: 255.255.255.0 - swift_zone: '128' - uid: '128' - user_node_name: Untitled (6f:9d) -- fqdn: node-129.test.domain.local - internal_address: 192.168.0.3 - internal_netmask: 255.255.255.0 - name: node-129 - public_address: 172.16.0.3 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.3 - storage_netmask: 255.255.255.0 - swift_zone: '129' - uid: '129' - user_node_name: Untitled (74:27) -- fqdn: node-131.test.domain.local - internal_address: 192.168.0.4 - internal_netmask: 255.255.255.0 - name: node-131 - public_address: 172.16.0.4 - public_netmask: 255.255.255.0 - role: controller - storage_address: 192.168.1.4 - storage_netmask: 255.255.255.0 - swift_zone: '131' - uid: '131' - user_node_name: Untitled (34:45) -- fqdn: node-132.test.domain.local - internal_address: 192.168.0.5 - internal_netmask: 255.255.255.0 - name: node-132 - role: compute - storage_address: 192.168.1.5 - storage_netmask: 255.255.255.0 - swift_zone: '132' - uid: '132' - user_node_name: Untitled (18:c9) nova: db_password: mqnsUMgC state_path: /var/lib/nova diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb index b3f64a55f8..54a7613dee 100644 --- a/tests/noop/spec/hosts/keystone/keystone_spec.rb +++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb @@ -36,12 +36,6 @@ describe manifest do configuration_override.fetch('keystone_config', {}) end - nodes = Noop.hiera 'nodes' - internal_address = Noop.node_hash['internal_address'] - primary_controller_nodes = Noop.puppet_function('filter_nodes', nodes, 'role', 'primary-controller') - controllers = primary_controller_nodes + Noop.puppet_function('filter_nodes', nodes, 'role', 'controller') - controller_internal_addresses = Noop.puppet_function('nodes_to_hash', controllers, 'name', 'internal_address') - controller_nodes = Noop.puppet_function('ipsort', controller_internal_addresses.values) admin_token = Noop.hiera_structure 'keystone/admin_token' public_vip = Noop.hiera('public_vip') management_vip= Noop.hiera('management_vip') diff --git a/tests/noop/spec/hosts/roles/mongo_spec.rb b/tests/noop/spec/hosts/roles/mongo_spec.rb index 356ca129da..371437505d 100644 --- a/tests/noop/spec/hosts/roles/mongo_spec.rb +++ b/tests/noop/spec/hosts/roles/mongo_spec.rb @@ -15,7 +15,6 @@ describe manifest do debug = Noop.hiera 'debug' use_syslog = Noop.hiera 'use_syslog' ceilometer_hash = Noop.hiera_structure 'ceilometer' - nodes_hash = Noop.hiera 'nodes' mongodb_port = Noop.hiera('mongodb_port', '27017') it 'should configure MongoDB only with replica set' do diff --git a/tests/noop/spec/hosts/swift/swift_spec.rb b/tests/noop/spec/hosts/swift/swift_spec.rb index 95185a075e..aa2200f283 100644 --- a/tests/noop/spec/hosts/swift/swift_spec.rb +++ b/tests/noop/spec/hosts/swift/swift_spec.rb @@ -7,15 +7,17 @@ describe manifest do role = Noop.hiera 'role' storage_hash = Noop.hiera 'storage' swift_hash = Noop.hiera 'swift' - nodes = Noop.hiera 'nodes' - primary_controller_nodes = Noop.puppet_function('filter_nodes', nodes, 'role','primary-controller') - controllers = primary_controller_nodes + Noop.puppet_function('filter_nodes', nodes, 'role', 'controller') - controller_internal_addresses = Noop.puppet_function('nodes_to_hash', controllers,'name','internal_address') - controller_nodes = Noop.puppet_function('ipsort', controller_internal_addresses.values) + network_scheme = Noop.hiera_hash 'network_scheme' + network_metadata = Noop.hiera_hash 'network_metadata' + + memcached_nodes = Noop.puppet_function('get_nodes_hash_by_roles', network_metadata, ['primary-controller', 'controller']) + memcached_addresses = Noop.puppet_function('get_node_to_ipaddr_map_by_network_role', memcached_nodes, 'mgmt/memcache').values + memcached_servers = memcached_addresses.sort.map{ |n| n = n + ':11211' } + + swift_operator_roles = storage_hash.fetch('swift_operator_roles', ['admin', 'SwiftOperator']) ring_part_power = swift_hash.fetch('ring_part_power', 10) ring_min_part_hours = Noop.hiera 'swift_ring_min_part_hours', 1 - memcached_servers = controller_nodes.map{ |n| n = n + ':11211' } deploy_swift_proxy = Noop.hiera('deploy_swift_proxy') rabbit_hosts = Noop.hiera('amqp_hosts') rabbit_user = Noop.hiera_structure('rabbit/user', 'nova') diff --git a/tests/noop/spec/lib/overrides.rb b/tests/noop/spec/lib/overrides.rb index 6aff3d0f84..82a3a21394 100644 --- a/tests/noop/spec/lib/overrides.rb +++ b/tests/noop/spec/lib/overrides.rb @@ -156,10 +156,6 @@ class Noop self.fqdn.split('.').first end - def node_hash - hiera('nodes').find { |node| node['fqdn'] == fqdn } || {} - end - end extend Overrides end