Contrail-controller role
Instead of contrail-config, contrail-control contrail-db roles there will be one role, called contrail-controller. Change-Id: I2c472c0b5107b127a8183024c2a1a29aa59deede Signed-off-by: Illia Polliul <ipolliul@mirantis.com>
This commit is contained in:
parent
afc0b2317f
commit
57433da267
|
@ -33,9 +33,9 @@ class contrail::database {
|
|||
sysctl::value { 'vm.swappiness':
|
||||
value => '10'
|
||||
}
|
||||
if roles_include($contrail::contrail_db_roles) {
|
||||
$cassandra_ips = $::contrail::contrail_db_ips
|
||||
$cassandra_seeds = $contrail::primary_contrail_db_ip
|
||||
if roles_include($contrail::contrail_controller_roles) {
|
||||
$cassandra_ips = $::contrail::contrail_controller_ips
|
||||
$cassandra_seeds = $contrail::primary_contrail_controller_ip
|
||||
$cluster_name = 'Contrail'
|
||||
|
||||
# Zookeeper
|
||||
|
|
|
@ -155,49 +155,52 @@ class contrail {
|
|||
$rabbit_ips = split(inline_template("<%= @rabbit_hosts_ports.split(',').map {|c| c.strip.gsub(/:[0-9]*$/,'')}.join(',') %>"),',')
|
||||
|
||||
# Contrail DB nodes Private IP list
|
||||
$primary_contrail_db_nodes_hash = get_nodes_hash_by_roles($network_metadata, ['primary-contrail-db'])
|
||||
$primary_contrail_db_ip = ipsort(values(get_node_to_ipaddr_map_by_network_role($primary_contrail_db_nodes_hash, 'neutron/mesh')))
|
||||
#$primary_contrail_db_nodes_hash = get_nodes_hash_by_roles($network_metadata, ['primary-contrail-db'])
|
||||
#$primary_contrail_db_ip = ipsort(values(get_node_to_ipaddr_map_by_network_role($primary_contrail_db_nodes_hash, 'neutron/mesh')))
|
||||
|
||||
$contrail_db_roles = hiera('contrail_db_roles', ['primary-contrail-db', 'contrail-db'])
|
||||
$contrail_db_nodes_hash = get_nodes_hash_by_roles($network_metadata, $contrail_db_roles)
|
||||
$contrail_db_ips = ipsort(values(get_node_to_ipaddr_map_by_network_role($contrail_db_nodes_hash, 'neutron/mesh')))
|
||||
#$contrail_db_roles = hiera('contrail_db_roles', ['primary-contrail-db', 'contrail-db'])
|
||||
#$contrail_db_nodes_hash = get_nodes_hash_by_roles($network_metadata, $contrail_db_roles)
|
||||
#$contrail_db_ips = ipsort(values(get_node_to_ipaddr_map_by_network_role($contrail_db_nodes_hash, 'neutron/mesh')))
|
||||
|
||||
# Dedicated Analytics DB
|
||||
$dedicated_analytics_db = pick($settings['dedicated_analytics_db'], false)
|
||||
$primary_analytics_db_nodes_hash = get_nodes_hash_by_roles($network_metadata, ['primary-contrail-analytics-db'])
|
||||
$primary_analytics_db_ip = ipsort(values(get_node_to_ipaddr_map_by_network_role($primary_analytics_db_nodes_hash, 'neutron/mesh')))
|
||||
|
||||
if $dedicated_analytics_db {
|
||||
$primary_analytics_db_nodes_hash = get_nodes_hash_by_roles($network_metadata, ['primary-contrail-analytics-db'])
|
||||
$primary_analytics_db_ip = ipsort(values(get_node_to_ipaddr_map_by_network_role($primary_analytics_db_nodes_hash, 'neutron/mesh')))
|
||||
|
||||
$analytics_db_roles = hiera('contrail_analytics_db_roles', ['primary-contrail-analytics-db', 'contrail-analytics-db'])
|
||||
$analytics_db_nodes_hash = get_nodes_hash_by_roles($network_metadata, $analytics_db_roles)
|
||||
$analytics_db_ips = ipsort(values(get_node_to_ipaddr_map_by_network_role($analytics_db_nodes_hash, 'neutron/mesh')))
|
||||
} else {
|
||||
$analytics_db_ips = $contrail_db_ips
|
||||
}
|
||||
$analytics_db_roles = hiera('contrail_analytics_db_roles', ['primary-contrail-analytics-db', 'contrail-analytics-db'])
|
||||
$analytics_db_nodes_hash = get_nodes_hash_by_roles($network_metadata, $analytics_db_roles)
|
||||
$analytics_db_ips = ipsort(values(get_node_to_ipaddr_map_by_network_role($analytics_db_nodes_hash, 'neutron/mesh')))
|
||||
|
||||
# Contrail Control nodes Private IP list
|
||||
$contrail_control_roles = hiera('contrail_control_roles', ['primary-contrail-control', 'contrail-control'])
|
||||
$contrail_control_nodes_hash = get_nodes_hash_by_roles($network_metadata, $contrail_control_roles)
|
||||
$contrail_control_ips = ipsort(values(get_node_to_ipaddr_map_by_network_role($contrail_control_nodes_hash, 'neutron/mesh')))
|
||||
#$contrail_control_roles = hiera('contrail_control_roles', ['primary-contrail-control', 'contrail-control'])
|
||||
#$contrail_control_nodes_hash = get_nodes_hash_by_roles($network_metadata, $contrail_control_roles)
|
||||
#$contrail_control_ips = ipsort(values(get_node_to_ipaddr_map_by_network_role($contrail_control_nodes_hash, 'neutron/mesh')))
|
||||
|
||||
# Contrail Config nodes Private IP list
|
||||
$contrail_config_roles = hiera('contrail_config_roles', ['primary-contrail-config', 'contrail-config'])
|
||||
$contrail_config_nodes_hash = get_nodes_hash_by_roles($network_metadata, $contrail_config_roles)
|
||||
$contrail_config_ips = ipsort(values(get_node_to_ipaddr_map_by_network_role($contrail_config_nodes_hash, 'neutron/mesh')))
|
||||
#$contrail_config_roles = hiera('contrail_config_roles', ['primary-contrail-config', 'contrail-config'])
|
||||
#$contrail_config_nodes_hash = get_nodes_hash_by_roles($network_metadata, $contrail_config_roles)
|
||||
#$contrail_config_ips = ipsort(values(get_node_to_ipaddr_map_by_network_role($contrail_config_nodes_hash, 'neutron/mesh')))
|
||||
|
||||
# Contrail Analytics nodes Private IP list
|
||||
$contrail_analytics_roles = hiera('contrail_analytics_roles', ['primary-contrail-analytics', 'contrail-analytics'])
|
||||
$contrail_analytics_nodes_hash = get_nodes_hash_by_roles($network_metadata, $contrail_analytics_roles)
|
||||
$contrail_analytics_ips = ipsort(values(get_node_to_ipaddr_map_by_network_role($contrail_analytics_nodes_hash, 'neutron/mesh')))
|
||||
|
||||
# Contrail Controller nodes Private IP list
|
||||
$contrail_controller_roles = hiera('contrail_controller_roles', ['primary-contrail-controller', 'contrail-controller'])
|
||||
$contrail_controller_nodes_hash = get_nodes_hash_by_roles($network_metadata, $contrail_controller_roles)
|
||||
$contrail_controller_ips = ipsort(values(get_node_to_ipaddr_map_by_network_role($contrail_controller_nodes_hash, 'neutron/mesh')))
|
||||
|
||||
# Contrail Primary Controller nodes Private IP list
|
||||
$primary_contrail_controller_nodes_hash = get_nodes_hash_by_roles($network_metadata, ['primary-contrail-controller'])
|
||||
$primary_contrail_controller_ip = ipsort(values(get_node_to_ipaddr_map_by_network_role($primary_contrail_controller_nodes_hash, 'neutron/mesh')))
|
||||
|
||||
# Cassandra, Kafka & Zookeeper servers list
|
||||
$contrail_db_list = inline_template("<%= scope.lookupvar('contrail::contrail_db_ips').map{ |ip| \"#{ip}:9042\" }.join(' ') %>")
|
||||
$contrail_db_list_9160 = inline_template("<%= scope.lookupvar('contrail::contrail_db_ips').map{ |ip| \"#{ip}:9160\" }.join(' ') %>")
|
||||
$contrail_db_list = inline_template("<%= scope.lookupvar('contrail::contrail_controller_ips').map{ |ip| \"#{ip}:9042\" }.join(' ') %>")
|
||||
$contrail_db_list_9160 = inline_template("<%= scope.lookupvar('contrail::contrail_controller_ips').map{ |ip| \"#{ip}:9160\" }.join(' ') %>")
|
||||
$analytics_db_list = inline_template("<%= scope.lookupvar('contrail::analytics_db_ips').map{ |ip| \"#{ip}:9042\" }.join(' ') %>")
|
||||
$analytics_db_list_9160 = inline_template("<%= scope.lookupvar('contrail::analytics_db_ips').map{ |ip| \"#{ip}:9160\" }.join(' ') %>")
|
||||
$kafka_broker_list = inline_template("<%= scope.lookupvar('contrail::analytics_db_ips').map{ |ip| \"#{ip}:9092\" }.join(' ') %>")
|
||||
$zk_server_ip = inline_template("<%= scope.lookupvar('contrail::contrail_db_ips').map{ |ip| \"#{ip}:2181\" }.join(',') %>")
|
||||
$zk_server_ip = inline_template("<%= scope.lookupvar('contrail::contrail_controller_ips').map{ |ip| \"#{ip}:2181\" }.join(',') %>")
|
||||
|
||||
# vCenter settings
|
||||
$use_vcenter = hiera('use_vcenter', false)
|
||||
|
|
|
@ -37,7 +37,7 @@ then exit 1; fi'",
|
|||
creates => '/opt/contrail/prov_config_node-DONE',
|
||||
}
|
||||
|
||||
if roles_include('primary-contrail-config') {
|
||||
if roles_include('primary-contrail-controller') {
|
||||
exec { 'prov_metadata_services':
|
||||
command => "python /opt/contrail/utils/provision_linklocal.py \
|
||||
--api_server_ip ${contrail::contrail_mgmt_vip} --api_server_port 8082 \
|
||||
|
|
|
@ -53,7 +53,7 @@ then exit 1; fi'",
|
|||
try_sleep => 10,
|
||||
}
|
||||
|
||||
if roles_include('primary-contrail-control') {
|
||||
if roles_include('primary-contrail-controller') {
|
||||
exec { 'prov_control_asn':
|
||||
command => "python /opt/contrail/utils/provision_control.py \
|
||||
--api_server_ip ${contrail::contrail_mgmt_vip} --api_server_port 8082 \
|
||||
|
@ -76,7 +76,7 @@ then exit 1; fi'",
|
|||
require => Exec['wait_for_api'],
|
||||
}
|
||||
|
||||
if roles_include('primary-contrail-control') {
|
||||
if roles_include('primary-contrail-controller') {
|
||||
contrail::provision::prov_ext_bgp { $contrail::gateways:
|
||||
require => [Exec['wait_for_api'],Exec['prov_control_bgp']],
|
||||
}
|
||||
|
|
|
@ -46,8 +46,8 @@ class contrail::vip {
|
|||
order => '201',
|
||||
listen_port => 8082,
|
||||
balancermember_port => 9100,
|
||||
server_names => $contrail::contrail_config_ips,
|
||||
ipaddresses => $contrail::contrail_config_ips,
|
||||
server_names => $contrail::contrail_controller_ips,
|
||||
ipaddresses => $contrail::contrail_controller_ips,
|
||||
public => false,
|
||||
internal => true,
|
||||
haproxy_config_options => { 'option' => 'nolinger',
|
||||
|
@ -60,8 +60,8 @@ class contrail::vip {
|
|||
order => '202',
|
||||
listen_port => $contrail::contrail_api_public_port,
|
||||
balancermember_port => 9100,
|
||||
server_names => $contrail::contrail_config_ips,
|
||||
ipaddresses => $contrail::contrail_config_ips,
|
||||
server_names => $contrail::contrail_controller_ips,
|
||||
ipaddresses => $contrail::contrail_controller_ips,
|
||||
public => true,
|
||||
internal => false,
|
||||
public_ssl => $contrail::public_ssl,
|
||||
|
@ -76,8 +76,8 @@ class contrail::vip {
|
|||
order => '203',
|
||||
listen_port => 5998,
|
||||
balancermember_port => 9110,
|
||||
server_names => $contrail::contrail_config_ips,
|
||||
ipaddresses => $contrail::contrail_config_ips,
|
||||
server_names => $contrail::contrail_controller_ips,
|
||||
ipaddresses => $contrail::contrail_controller_ips,
|
||||
public => false,
|
||||
internal => true,
|
||||
haproxy_config_options => { 'option' => 'nolinger',
|
||||
|
@ -89,8 +89,8 @@ class contrail::vip {
|
|||
order => '204',
|
||||
listen_port => 8143,
|
||||
balancermember_port => $ui_backend_port,
|
||||
server_names => $contrail::contrail_config_ips,
|
||||
ipaddresses => $contrail::contrail_config_ips,
|
||||
server_names => $contrail::contrail_controller_ips,
|
||||
ipaddresses => $contrail::contrail_controller_ips,
|
||||
public => true,
|
||||
internal => false,
|
||||
public_ssl => $contrail::public_ssl,
|
||||
|
|
|
@ -25,10 +25,10 @@ helper:mapclient
|
|||
|
||||
# This is a read-only MAPC
|
||||
reader:reader
|
||||
<%- scope.lookupvar('contrail::contrail_config_ips').each do |ip| -%>
|
||||
<%- scope.lookupvar('contrail::contrail_controller_ips').each do |ip| -%>
|
||||
<%= ip %>:<%= ip %>
|
||||
<%- end -%>
|
||||
<%- scope.lookupvar('contrail::contrail_control_ips').each do |ip| -%>
|
||||
<%- scope.lookupvar('contrail::contrail_controller_ips').each do |ip| -%>
|
||||
<%= ip %>:<%= ip %>
|
||||
<%= ip %>.dns:<%= ip %>.dns
|
||||
<%- end -%>
|
||||
|
|
|
@ -173,7 +173,7 @@ config.files.download_path = '/tmp';
|
|||
|
||||
/* Cassandra Server */
|
||||
config.cassandra = {};
|
||||
config.cassandra.server_ips = [<%= scope.lookupvar('contrail::contrail_db_ips').map{ |ip| "'#{ip}'" }.join(',') %>];
|
||||
config.cassandra.server_ips = [<%= scope.lookupvar('contrail::contrail_controller_ips').map{ |ip| "'#{ip}'" }.join(',') %>];
|
||||
config.cassandra.server_port = '9160';
|
||||
config.cassandra.enable_edit = false;
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ admin_tenant_name=services
|
|||
api.hostname=<%= scope.lookupvar('contrail::contrail_private_vip') %>
|
||||
api.port=8082
|
||||
|
||||
zookeeper.serverlist=<%= scope.lookupvar('contrail::contrail_db_ips').map{ |ip| "#{ip}:2181" }.join(',') %>
|
||||
zookeeper.serverlist=<%= scope.lookupvar('contrail::contrail_controller_ips').map{ |ip| "#{ip}:2181" }.join(',') %>
|
||||
|
||||
# HTTP Introspect
|
||||
introspect.port=8234
|
||||
|
|
|
@ -117,7 +117,7 @@ log.cleanup.policy=compact
|
|||
delete.topic.enable=true
|
||||
|
||||
#default replication factors for automatically created topics
|
||||
<% if scope.lookupvar('contrail::contrail_db_ips').length > 1 -%>
|
||||
<% if scope.lookupvar('contrail::contrail_controller_ips').length > 1 -%>
|
||||
default.replication.factor=2
|
||||
<% else %>
|
||||
default.replication.factor=1
|
||||
|
|
|
@ -5,7 +5,7 @@ dataDir=/var/lib/zookeeper
|
|||
clientPort=2181
|
||||
maxSessionTimeout=120000
|
||||
<%-
|
||||
nodes=scope.lookupvar('contrail::contrail_db_nodes_hash')
|
||||
nodes=scope.lookupvar('contrail::contrail_controller_nodes_hash')
|
||||
nodes.each_pair do |node_name, node_props|
|
||||
-%>
|
||||
server.<%= node_props['uid'] %>=<%= node_props['network_roles']['neutron/mesh']%>:2888:3888
|
||||
|
|
|
@ -1,8 +1,18 @@
|
|||
# Groups
|
||||
# Contrail - DB
|
||||
- id: primary-contrail-db
|
||||
# Contrail - Controller
|
||||
- id: primary-contrail-controller
|
||||
type: group
|
||||
role: [primary-contrail-db]
|
||||
role: [primary-contrail-controller]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, primary-contrail-controller]
|
||||
parameters:
|
||||
strategy:
|
||||
type: one_by_one
|
||||
|
||||
- id: contrail-controller
|
||||
type: group
|
||||
role: [contrail-controller]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start]
|
||||
|
@ -10,37 +20,6 @@
|
|||
strategy:
|
||||
type: one_by_one
|
||||
|
||||
- id: contrail-db
|
||||
type: group
|
||||
role: [contrail-db]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, primary-contrail-db]
|
||||
parameters:
|
||||
strategy:
|
||||
type: one_by_one
|
||||
#
|
||||
# Contrail - Config
|
||||
- id: primary-contrail-config
|
||||
type: group
|
||||
role: [primary-contrail-config]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, contrail-db, primary-controller]
|
||||
parameters:
|
||||
strategy:
|
||||
type: one_by_one
|
||||
|
||||
- id: contrail-config
|
||||
type: group
|
||||
role: [contrail-config]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, primary-contrail-config]
|
||||
parameters:
|
||||
strategy:
|
||||
type: parallel
|
||||
|
||||
# Contrail - Analytics DB
|
||||
- id: primary-contrail-analytics-db
|
||||
type: group
|
||||
|
@ -68,7 +47,7 @@
|
|||
role: [primary-contrail-analytics]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, contrail-db, primary-contrail-config]
|
||||
requires: [deploy_start, primary-contrail-controller]
|
||||
parameters:
|
||||
strategy:
|
||||
type: one_by_one
|
||||
|
@ -78,28 +57,7 @@
|
|||
role: [contrail-analytics]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, contrail-db, primary-contrail-analytics]
|
||||
parameters:
|
||||
strategy:
|
||||
type: parallel
|
||||
#
|
||||
# Contrail - Control
|
||||
- id: primary-contrail-control
|
||||
type: group
|
||||
role: [primary-contrail-control]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, contrail-config]
|
||||
parameters:
|
||||
strategy:
|
||||
type: one_by_one
|
||||
|
||||
- id: contrail-control
|
||||
type: group
|
||||
role: [contrail-control]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, primary-contrail-control]
|
||||
requires: [deploy_start, primary-contrail-controller]
|
||||
parameters:
|
||||
strategy:
|
||||
type: parallel
|
||||
|
@ -109,7 +67,7 @@
|
|||
role: [primary-contrail-tsn]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, primary-contrail-control]
|
||||
requires: [deploy_start, primary-contrail-controller]
|
||||
parameters:
|
||||
strategy:
|
||||
type: parallel
|
||||
|
@ -119,7 +77,7 @@
|
|||
role: [contrail-tsn]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, primary-contrail-control]
|
||||
requires: [deploy_start, primary-contrail-controller]
|
||||
parameters:
|
||||
strategy:
|
||||
type: parallel
|
||||
|
@ -128,9 +86,7 @@
|
|||
# Group for post-deployment tasks
|
||||
- id: contrail-post-deploy
|
||||
type: group
|
||||
role: [primary-contrail-db, contrail-db,
|
||||
primary-contrail-config, contrail-config,
|
||||
primary-contrail-control,contrail-control,
|
||||
role: [primary-contrail-controller, contrail-controller,
|
||||
primary-contrail-analytics,contrail-analytics,
|
||||
primary-contrail-analytics-db,contrail-analytics-db]
|
||||
tasks: [configure_default_route, dns-client, ntp-client]
|
||||
|
@ -170,7 +126,7 @@
|
|||
type: group
|
||||
role: [contrail-vmware]
|
||||
tasks: [hiera, globals, setup_repositories, tools, logging, netconfig, hosts, deploy_start, dns-client, ntp-client]
|
||||
required_for: [deploy_end, primary-contrail-control, primary-contrail-db, primary-controller]
|
||||
required_for: [deploy_end, primary-contrail-controller]
|
||||
requires: [deploy_start]
|
||||
parameters:
|
||||
strategy:
|
||||
|
@ -198,7 +154,7 @@
|
|||
- id: contrail-db-primary
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [primary-contrail-db, primary-contrail-analytics-db]
|
||||
groups: [primary-contrail-controller, primary-contrail-analytics-db]
|
||||
reexecute_on: [deploy_changes]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-utils]
|
||||
|
@ -224,7 +180,7 @@
|
|||
- id: contrail-db-all
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [contrail-db, contrail-analytics-db]
|
||||
groups: [contrail-controller, contrail-analytics-db]
|
||||
reexecute_on: [deploy_changes]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-utils]
|
||||
|
@ -246,7 +202,7 @@
|
|||
- id: contrail-config-primary
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [primary-contrail-config]
|
||||
groups: [primary-contrail-controller]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-utils, deploy_start]
|
||||
reexecute_on: [deploy_changes]
|
||||
|
@ -266,7 +222,7 @@
|
|||
- id: contrail-config-provision-primary
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [primary-contrail-config]
|
||||
groups: [primary-contrail-controller]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-config-primary]
|
||||
reexecute_on: [deploy_changes]
|
||||
|
@ -282,7 +238,7 @@
|
|||
- id: contrail-config-all
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [contrail-config]
|
||||
groups: [contrail-controller]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-utils]
|
||||
reexecute_on: [deploy_changes]
|
||||
|
@ -303,7 +259,7 @@
|
|||
- id: contrail-config-provision-all
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [contrail-config]
|
||||
groups: [contrail-controller]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-config-all]
|
||||
parameters:
|
||||
|
@ -353,7 +309,7 @@
|
|||
- id: contrail-control-primary
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [primary-contrail-control]
|
||||
groups: [primary-contrail-controller]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-utils]
|
||||
cross-depends:
|
||||
|
@ -372,7 +328,7 @@
|
|||
- id: contrail-control-provision-primary
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [primary-contrail-control]
|
||||
groups: [primary-contrail-controller]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-control-primary]
|
||||
parameters:
|
||||
|
@ -387,7 +343,7 @@
|
|||
- id: contrail-control-all
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [contrail-control]
|
||||
groups: [contrail-controller]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-utils]
|
||||
cross-depends:
|
||||
|
@ -407,7 +363,7 @@
|
|||
- id: contrail-control-provision-all
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [contrail-control]
|
||||
groups: [contrail-controller]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-control-all]
|
||||
cross-depends:
|
||||
|
@ -426,7 +382,7 @@
|
|||
- id: contrail-db-provision-all
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [primary-contrail-db, contrail-db, primary-contrail-analytics-db, contrail-analytics-db]
|
||||
groups: [primary-contrail-controller, contrail-controller, primary-contrail-analytics-db, contrail-analytics-db]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-utils]
|
||||
cross-depends:
|
||||
|
@ -445,7 +401,7 @@
|
|||
- id: contrail-webui-provision-primary
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [primary-contrail-db]
|
||||
groups: [primary-contrail-controller]
|
||||
required_for: [deploy_end]
|
||||
requires: [contrail-db-primary]
|
||||
parameters:
|
||||
|
@ -607,7 +563,7 @@
|
|||
- id: controller-hiera-post
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
groups: [primary-controller,controller]
|
||||
groups: [primary-controller, controller]
|
||||
required_for: [deploy_end]
|
||||
requires: [openstack-network-end]
|
||||
parameters:
|
||||
|
|
|
@ -49,15 +49,6 @@ attributes:
|
|||
regex:
|
||||
source: '^(102[4-9]|10[3-9]\d|1[1-9]\d{2}|[2-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$'
|
||||
error: "Invalid port"
|
||||
dedicated_analytics_db:
|
||||
value: false
|
||||
type: "checkbox"
|
||||
label: "Dedicated Analytics DB"
|
||||
description: "Enable this option to enable deployment of dedicated Cassandra database for Contrail Analytics"
|
||||
weight: 65
|
||||
restrictions:
|
||||
- condition: "cluster:status == 'operational'"
|
||||
action: "disable"
|
||||
contrail_global_dpdk:
|
||||
value: false
|
||||
label: "Enable DPDK feature for this environment."
|
||||
|
|
|
@ -1,25 +1,6 @@
|
|||
contrail-db:
|
||||
name: Contrail - DB
|
||||
description: Contrail DB role. Provides Cassandra for Contrail
|
||||
has_primary: true
|
||||
limits:
|
||||
min: 1
|
||||
recommended: 3
|
||||
public_ip_required: false
|
||||
weight: 100
|
||||
conflicts:
|
||||
- controller
|
||||
- compute
|
||||
- ceph-osd
|
||||
- cinder
|
||||
- base-os
|
||||
- compute-vmware
|
||||
|
||||
contrail-config:
|
||||
name: Contrail - Config
|
||||
description: >
|
||||
Contrail config role. Provides IF_MAP, API, Discovery, Schema-transformer components of Contrail.
|
||||
Analytics and WebUI components are also here.
|
||||
contrail-controller:
|
||||
name: Contrail - Controller
|
||||
description: Contrail Controller role.
|
||||
has_primary: true
|
||||
limits:
|
||||
min: 1
|
||||
|
@ -67,30 +48,7 @@ contrail-analytics-db:
|
|||
- compute
|
||||
- ceph-osd
|
||||
- cinder
|
||||
- contrail-db
|
||||
- contrail-config
|
||||
- contrail-control
|
||||
- base-os
|
||||
- compute-vmware
|
||||
restrictions:
|
||||
- condition: "settings:contrail.dedicated_analytics_db.value == false"
|
||||
message: "Dedicated Analytics DB should be enabled in plugin settings"
|
||||
|
||||
contrail-control:
|
||||
name: Contrail - Control
|
||||
description: >
|
||||
Contrail control role. Provides Control and DNS components of Contrail.
|
||||
has_primary: true
|
||||
limits:
|
||||
min: 1
|
||||
recommended: 3
|
||||
public_ip_required: false
|
||||
weight: 100
|
||||
conflicts:
|
||||
- controller
|
||||
- compute
|
||||
- ceph-osd
|
||||
- cinder
|
||||
- contrail-controller
|
||||
- base-os
|
||||
- compute-vmware
|
||||
|
||||
|
@ -105,11 +63,7 @@ contrail-tsn:
|
|||
min: 1
|
||||
recommended: 2
|
||||
conflicts:
|
||||
- contrail-analytics
|
||||
- contrail-analytics-db
|
||||
- contrail-control
|
||||
- contrail-config
|
||||
- contrail-db
|
||||
- contrail-controller
|
||||
- controller
|
||||
- compute
|
||||
- compute-vmware
|
||||
|
@ -133,9 +87,7 @@ dpdk:
|
|||
weight: 100
|
||||
conflicts:
|
||||
- controller
|
||||
- contrail-db
|
||||
- contrail-config
|
||||
- contrail-control
|
||||
- contrail-controller
|
||||
- contrail-analytics
|
||||
- ceph-osd
|
||||
- cinder
|
||||
|
@ -154,10 +106,7 @@ dpdk-on-vf:
|
|||
weight: 100
|
||||
conflicts:
|
||||
- controller
|
||||
- contrail-db
|
||||
- contrail-config
|
||||
- contrail-control
|
||||
- contrail-analytics
|
||||
- contrail-controller
|
||||
- compute-vmware
|
||||
restrictions:
|
||||
- condition: "settings:contrail.dpdk_on_vf.value == false"
|
||||
|
@ -172,10 +121,7 @@ contrail-vmware:
|
|||
weight: 100
|
||||
conflicts:
|
||||
- controller
|
||||
- contrail-db
|
||||
- contrail-config
|
||||
- contrail-control
|
||||
- contrail-analytics
|
||||
- contrail-controller
|
||||
- ceph-osd
|
||||
- cinder
|
||||
- dpdk
|
||||
|
|
10
volumes.yaml
10
volumes.yaml
|
@ -14,7 +14,7 @@ volumes:
|
|||
generator: "calc_total_vg"
|
||||
generator_args: ["contrail-db"]
|
||||
volumes_roles_mapping:
|
||||
contrail-db:
|
||||
contrail-controller:
|
||||
- {allocate_size: "min", id: "os"}
|
||||
- {allocate_size: "min", id: "contrail-db"}
|
||||
contrail-analytics-db:
|
||||
|
@ -25,12 +25,6 @@ volumes_roles_mapping:
|
|||
# since the roles could be used in stand alone nodes.
|
||||
# Furthermore, there is a lot of unallocated space left over.
|
||||
|
||||
contrail-config:
|
||||
- {allocate_size: "min", id: "os"}
|
||||
- {allocate_size: "all", id: "logs"}
|
||||
contrail-control:
|
||||
- {allocate_size: "min", id: "os"}
|
||||
- {allocate_size: "all", id: "logs"}
|
||||
contrail-analytics:
|
||||
- {allocate_size: "min", id: "os"}
|
||||
- {allocate_size: "all", id: "logs"}
|
||||
- {allocate_size: "all", id: "logs"}
|
||||
|
|
Loading…
Reference in New Issue