diff options
Diffstat (limited to 'build/opnfv-tripleo-heat-templates.patch')
| -rw-r--r-- | build/opnfv-tripleo-heat-templates.patch | 256 |
1 files changed, 191 insertions, 65 deletions
diff --git a/build/opnfv-tripleo-heat-templates.patch b/build/opnfv-tripleo-heat-templates.patch index be40742e..f96f1251 100644 --- a/build/opnfv-tripleo-heat-templates.patch +++ b/build/opnfv-tripleo-heat-templates.patch @@ -1,31 +1,28 @@ -From 63f8b6412f526ba245d86f40eb6b1ae1ee06485d Mon Sep 17 00:00:00 2001 -From: Dan Radez <dradez@redhat.com> -Date: Sun, 13 Dec 2015 21:20:40 -0500 -Subject: [PATCH] Adds OpenDaylight support +From d9b3ccc28ff57bfa4e1135cea038ac4e5318947c Mon Sep 17 00:00:00 2001 +From: Tim Rozet <tdrozet@gmail.com> +Date: Tue, 12 Jan 2016 16:49:57 -0500 +Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support -To enable OpenDaylight on controllers use environments/opendaylight.yaml -To enable OpenDaylight on external node use -environments/opendaylight-external.yaml - -Adds onos support --- environments/onos.yaml | 8 + environments/opendaylight-external.yaml | 25 ++ environments/opendaylight.yaml | 25 ++ + environments/opendaylight_l3.yaml | 9 + overcloud-resource-registry-puppet.yaml | 3 + - overcloud-without-mergepy.yaml | 62 +++++ + overcloud-without-mergepy.yaml | 73 +++++ puppet/all-nodes-config.yaml | 6 + - puppet/compute.yaml | 25 ++ - puppet/controller.yaml | 35 +++ + puppet/compute.yaml | 35 +++ + puppet/controller.yaml | 47 ++++ puppet/manifests/overcloud_compute.pp | 33 ++- - puppet/manifests/overcloud_controller.pp | 80 +++++- - puppet/manifests/overcloud_controller_pacemaker.pp | 299 +++++++++++++-------- - puppet/manifests/overcloud_opendaylight.pp | 26 ++ - puppet/opendaylight-puppet.yaml | 209 ++++++++++++++ - 13 files changed, 712 insertions(+), 124 deletions(-) + puppet/manifests/overcloud_controller.pp | 86 +++++- + puppet/manifests/overcloud_controller_pacemaker.pp | 302 +++++++++++++-------- + puppet/manifests/overcloud_opendaylight.pp | 27 ++ + puppet/opendaylight-puppet.yaml | 217 +++++++++++++++ + 14 files changed, 772 insertions(+), 124 deletions(-) create mode 100644 environments/onos.yaml create mode 100644 environments/opendaylight-external.yaml create mode 100644 environments/opendaylight.yaml + create mode 100644 environments/opendaylight_l3.yaml create mode 100644 puppet/manifests/overcloud_opendaylight.pp create mode 100644 puppet/opendaylight-puppet.yaml @@ -105,8 +102,23 @@ index 0000000..c8abf75 + # reduce OpenDaylightCount to 0 if you don't want any + # OpenDaylight only nodes + opendaylight_install: true +diff --git a/environments/opendaylight_l3.yaml b/environments/opendaylight_l3.yaml +new file mode 100644 +index 0000000..ffdb017 +--- /dev/null ++++ b/environments/opendaylight_l3.yaml +@@ -0,0 +1,9 @@ ++parameters: ++ #NeutronEnableL3Agent: false ++ NeutronEnableForceMetadata: true ++ OpenDaylightEnableL3: true ++ NeutronServicePlugins: "networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin" ++ ExtraConfig: ++ neutron_mechanism_drivers: ['opendaylight'] ++ neutron_tenant_network_type: vxlan ++ opendaylight_install: true diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml -index c072c29..2413450 100644 +index 4cfed6b..adecc79 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -27,6 +27,9 @@ resource_registry: @@ -120,10 +132,21 @@ index c072c29..2413450 100644 # NodeUserData == Cloud-init additional user-data, e.g cloud-config # ControllerExtraConfigPre == Controller configuration pre service deployment diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml -index 01c0079..210ec11 100644 +index a532c2f..1aa87ae 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml -@@ -227,6 +227,23 @@ parameters: +@@ -113,6 +113,10 @@ parameters: + default: '' + type: string + description: Neutron ID for ctlplane network. ++ NeutronEnableForceMetadata: ++ default: 'False' ++ description: If True, DHCP always provides metadata route to VM. ++ type: string + NeutronEnableTunnelling: + type: string + default: "True" +@@ -227,6 +231,27 @@ parameters: default: false description: Should MongoDb journaling be disabled type: boolean @@ -131,6 +154,10 @@ index 01c0079..210ec11 100644 + default: 8081 + description: Set opendaylight service port + type: number ++ OpenDaylightEnableL3: ++ description: Knob to enable/disable ODL L3 ++ type: string ++ default: 'no' + OpenDaylightInstall: + default: false + description: Whether to install OpenDaylight on the control nodes. @@ -147,7 +174,7 @@ index 01c0079..210ec11 100644 PublicVirtualFixedIPs: default: [] description: > -@@ -650,6 +667,18 @@ parameters: +@@ -664,6 +689,18 @@ parameters: structure as ExtraConfig. type: json @@ -166,7 +193,7 @@ index 01c0079..210ec11 100644 # Hostname format for each role # Note %index% is translated into the index of the node, e.g 0/1/2 etc # and %stackname% is replaced with OS::stack_name in the template below. -@@ -674,6 +703,10 @@ parameters: +@@ -688,6 +725,10 @@ parameters: type: string description: Format for CephStorage node hostnames default: '%stackname%-cephstorage-%index%' @@ -177,7 +204,7 @@ index 01c0079..210ec11 100644 # Identifiers to trigger tasks on nodes UpdateIdentifier: -@@ -756,6 +789,27 @@ resources: +@@ -770,6 +811,28 @@ resources: SwiftProxyVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]} PublicVirtualIP: {get_attr: [VipMap, net_ip_map, external]} @@ -196,6 +223,7 @@ index 01c0079..210ec11 100644 + OpenDaylightPort: {get_param: OpenDaylightPort} + OpenDaylightUsername: {get_param: OpenDaylightUsername} + OpenDaylightPassword: {get_param: OpenDaylightPassword} ++ OpenDaylightEnableL3: {get_param: OpenDaylightEnableL3} + OpenDaylightHostname: + str_replace: + template: {get_param: OpenDaylightHostnameFormat} @@ -205,7 +233,15 @@ index 01c0079..210ec11 100644 Controller: type: OS::Heat::ResourceGroup depends_on: Networks -@@ -839,6 +893,10 @@ resources: +@@ -832,6 +895,7 @@ resources: + NeutronBridgeMappings: {get_param: NeutronBridgeMappings} + NeutronExternalNetworkBridge: {get_param: NeutronExternalNetworkBridge} + NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling} ++ NeutronEnableForceMetadata: {get_param: NeutronEnableForceMetadata} + NeutronNetworkVLANRanges: {get_param: NeutronNetworkVLANRanges} + NeutronPublicInterface: {get_param: NeutronPublicInterface} + NeutronPublicInterfaceDefaultRoute: {get_param: NeutronPublicInterfaceDefaultRoute} +@@ -853,6 +917,11 @@ resources: NovaPassword: {get_param: NovaPassword} NtpServer: {get_param: NtpServer} MongoDbNoJournal: {get_param: MongoDbNoJournal} @@ -213,11 +249,12 @@ index 01c0079..210ec11 100644 + OpenDaylightInstall: {get_param: OpenDaylightInstall} + OpenDaylightUsername: {get_param: OpenDaylightUsername} + OpenDaylightPassword: {get_param: OpenDaylightPassword} ++ OpenDaylightEnableL3: {get_param: OpenDaylightEnableL3} PcsdPassword: {get_resource: PcsdPassword} PublicVirtualInterface: {get_param: PublicVirtualInterface} RabbitPassword: {get_param: RabbitPassword} -@@ -933,6 +991,9 @@ resources: - NovaPublicIP: {get_attr: [VipMap, net_ip_map, external]} +@@ -948,6 +1017,9 @@ resources: + NovaPublicIP: {get_attr: [PublicVirtualIP, ip_address]} NovaPassword: {get_param: NovaPassword} NtpServer: {get_param: NtpServer} + OpenDaylightPort: {get_param: OpenDaylightPort} @@ -226,7 +263,7 @@ index 01c0079..210ec11 100644 RabbitHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]} RabbitPassword: {get_param: RabbitPassword} RabbitUserName: {get_param: RabbitUserName} -@@ -1053,6 +1114,7 @@ resources: +@@ -1068,6 +1140,7 @@ resources: compute_hosts: {get_attr: [Compute, hosts_entry]} controller_hosts: {get_attr: [Controller, hosts_entry]} controller_ips: {get_attr: [Controller, ip_address]} @@ -259,7 +296,7 @@ index 2bc519b..98283c2 100644 list_join: - ',' diff --git a/puppet/compute.yaml b/puppet/compute.yaml -index e259cff..5527669 100644 +index 70c7403..13fd4f6 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -213,6 +213,23 @@ parameters: @@ -286,8 +323,36 @@ index e259cff..5527669 100644 RabbitHost: type: string default: '' # Has to be here because of the ignored empty value bug -@@ -415,6 +432,10 @@ resources: - neutron::rabbit_user: {get_input: rabbit_username} +@@ -320,6 +337,11 @@ resources: + properties: + ControlPlaneIP: {get_attr: [NovaCompute, networks, ctlplane, 0]} + ++ ExternalPort: ++ type: OS::TripleO::Controller::Ports::ExternalPort ++ properties: ++ ControlPlaneIP: {get_attr: [NovaCompute, networks, ctlplane, 0]} ++ + NetIpMap: + type: OS::TripleO::Network::Ports::NetIpMap + properties: +@@ -327,6 +349,7 @@ resources: + InternalApiIp: {get_attr: [InternalApiPort, ip_address]} + StorageIp: {get_attr: [StoragePort, ip_address]} + TenantIp: {get_attr: [TenantPort, ip_address]} ++ ExternalIp: {get_attr: [ExternalPort, ip_address]} + + NetworkConfig: + type: OS::TripleO::Compute::Net::SoftwareConfig +@@ -335,6 +358,7 @@ resources: + InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]} + StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]} + TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]} ++ ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]} + + NetworkDeployment: + type: OS::TripleO::SoftwareDeployment +@@ -406,6 +430,10 @@ resources: + neutron::rabbit_user: {get_input: rabbit_user} neutron::rabbit_use_ssl: {get_input: rabbit_client_use_ssl} neutron::rabbit_port: {get_input: rabbit_client_port} + opendaylight_port: {get_input: opendaylight_port} @@ -297,7 +362,7 @@ index e259cff..5527669 100644 neutron_flat_networks: {get_input: neutron_flat_networks} neutron_host: {get_input: neutron_host} neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip} -@@ -468,6 +489,10 @@ resources: +@@ -459,6 +487,10 @@ resources: snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName} snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} @@ -308,11 +373,32 @@ index e259cff..5527669 100644 neutron_flat_networks: {get_param: NeutronFlatNetworks} neutron_host: {get_param: NeutronHost} neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]} +@@ -570,6 +602,9 @@ outputs: + tenant_ip_address: + description: IP address of the server in the tenant network + value: {get_attr: [TenantPort, ip_address]} ++ external_ip_address: ++ description: IP address of the server in the external network ++ value: {get_attr: [ExternalPort, ip_address]} + hostname: + description: Hostname of the server + value: {get_attr: [NovaCompute, name]} diff --git a/puppet/controller.yaml b/puppet/controller.yaml -index fdc1821..865a838 100644 +index ea0b3af..1d52922 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml -@@ -443,6 +443,27 @@ parameters: +@@ -357,6 +357,10 @@ parameters: + default: 'True' + description: Allow automatic l3-agent failover + type: string ++ NeutronEnableForceMetadata: ++ default: 'False' ++ description: If True, DHCP always provides metadata route to VM. ++ type: string + NeutronEnableTunnelling: + type: string + default: "True" +@@ -443,6 +447,31 @@ parameters: NtpServer: type: string default: '' @@ -333,6 +419,10 @@ index fdc1821..865a838 100644 + type: string + description: The password for the opendaylight server. + hidden: true ++ OpenDaylightEnableL3: ++ description: Knob to enable/disable ODL L3 ++ type: string ++ default: 'no' + ONOSPort: + default: 8181 + description: Set onos service port @@ -340,7 +430,15 @@ index fdc1821..865a838 100644 PcsdPassword: type: string description: The password for the 'pcsd' user. -@@ -819,6 +840,11 @@ resources: +@@ -696,6 +725,7 @@ resources: + input_values: + bootstack_nodeid: {get_attr: [Controller, name]} + neutron_enable_tunneling: {get_param: NeutronEnableTunnelling} ++ neutron_enable_force_metadata: {get_param: NeutronEnableForceMetadata} + haproxy_log_address: {get_param: HAProxySyslogAddress} + heat.watch_server_url: + list_join: +@@ -805,6 +835,12 @@ resources: template: tripleo-CLUSTER params: CLUSTER: {get_param: MysqlClusterUniquePart} @@ -348,11 +446,12 @@ index fdc1821..865a838 100644 + opendaylight_install: {get_param: OpenDaylightInstall} + opendaylight_username: {get_param: OpenDaylightUsername} + opendaylight_password: {get_param: OpenDaylightPassword} ++ opendaylight_enable_l3: {get_param: OpenDaylightEnableL3} + onos_port: {get_param: ONOSPort} neutron_flat_networks: {get_param: NeutronFlatNetworks} neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} neutron_agent_mode: {get_param: NeutronAgentMode} -@@ -1151,6 +1177,15 @@ resources: +@@ -1136,6 +1172,16 @@ resources: mysql_bind_host: {get_input: mysql_network} mysql_virtual_ip: {get_input: mysql_virtual_ip} @@ -361,6 +460,7 @@ index fdc1821..865a838 100644 + opendaylight_install: {get_input: opendaylight_install} + opendaylight_username: {get_input: opendaylight_username} + opendaylight_password: {get_input: opendaylight_password} ++ opendaylight_enable_l3: {get_input: opendaylight_enable_l3} + + # ONOS + onos_port: {get_input: onos_port} @@ -368,6 +468,14 @@ index fdc1821..865a838 100644 # Neutron neutron::bind_host: {get_input: neutron_api_network} neutron::rabbit_password: {get_input: rabbit_password} +@@ -1152,6 +1198,7 @@ resources: + neutron_flat_networks: {get_input: neutron_flat_networks} + neutron::agents::metadata::shared_secret: {get_input: neutron_metadata_proxy_shared_secret} + neutron::agents::metadata::metadata_ip: {get_input: neutron_api_network} ++ neutron::agents::dhcp::enable_force_metadata: {get_input: neutron_enable_force_metadata} + neutron_agent_mode: {get_input: neutron_agent_mode} + neutron_router_distributed: {get_input: neutron_router_distributed} + neutron::core_plugin: {get_input: neutron_core_plugin} diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index cd41cc7..b8336ee 100644 --- a/puppet/manifests/overcloud_compute.pp @@ -413,10 +521,10 @@ index cd41cc7..b8336ee 100644 if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') { diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp -index 1b0429b..d3f3d2d 100644 +index 1f6c2be..7851b45 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp -@@ -30,6 +30,20 @@ if hiera('step') >= 1 { +@@ -30,6 +30,21 @@ if hiera('step') >= 1 { if hiera('step') >= 2 { @@ -424,6 +532,7 @@ index 1b0429b..d3f3d2d 100644 + class {"opendaylight": + extra_features => ['odl-ovsdb-openstack'], + odl_rest_port => hiera('opendaylight_port'), ++ enable_l3 => hiera('opendaylight_enable_l3', 'no'), + } + } + @@ -437,7 +546,7 @@ index 1b0429b..d3f3d2d 100644 if count(hiera('ntp::servers')) > 0 { include ::ntp } -@@ -223,9 +237,7 @@ +@@ -223,9 +238,7 @@ if hiera('step') >= 3 { include ::nova::scheduler include ::nova::scheduler::filter @@ -447,7 +556,7 @@ index 1b0429b..d3f3d2d 100644 include ::neutron::agents::dhcp include ::neutron::agents::metadata -@@ -238,15 +250,71 @@ if hiera('step') >= 3 { +@@ -237,15 +250,76 @@ if hiera('step') >= 3 { require => Package['neutron'], } @@ -458,7 +567,11 @@ index 1b0429b..d3f3d2d 100644 + } + } else { + include ::neutron -+ include ::neutron::agents::l3 ++ if 'opendaylight' in hiera('neutron_mechanism_drivers') { ++ if ! str2bool(hiera('opendaylight_enable_l3', 'no')) { ++ include ::neutron::agents::l3 ++ } ++ } + } + class { '::neutron::plugins::ml2': @@ -471,7 +584,9 @@ index 1b0429b..d3f3d2d 100644 - tunnel_types => split(hiera('neutron_tunnel_types'), ','), + + if 'opendaylight' in hiera('neutron_mechanism_drivers') { -+ ++ if ! str2bool(hiera('opendaylight_enable_l3', 'no')) { ++ Service['neutron-server'] -> Service['neutron-l3'] ++ } + if str2bool(hiera('opendaylight_install', 'false')) { + $controller_ips = split(hiera('controller_node_ips'), ',') + $opendaylight_controller_ip = $controller_ips[0] @@ -495,7 +610,6 @@ index 1b0429b..d3f3d2d 100644 + odl_password => hiera('opendaylight_password'), + } + } -+ Service['neutron-server'] -> Service['neutron-l3'] + + } elsif 'onos_ml2' in hiera('neutron_mechanism_drivers') { + #config ml2_conf.ini with onos url address @@ -522,7 +636,7 @@ index 1b0429b..d3f3d2d 100644 if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') { include ::neutron::plugins::ml2::cisco::nexus1000v -@@ -281,8 +349,6 @@ if hiera('step') >= 3 { +@@ -280,8 +354,6 @@ if hiera('step') >= 3 { } Service['neutron-server'] -> Service['neutron-dhcp-service'] @@ -532,10 +646,10 @@ index 1b0429b..d3f3d2d 100644 include ::cinder diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp -index 863cc5f..5b1c37a 100644 +index 3fb92f3..9568390 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp -@@ -380,6 +380,20 @@ if hiera('step') >= 2 { +@@ -380,6 +380,21 @@ if hiera('step') >= 2 { } @@ -543,6 +657,7 @@ index 863cc5f..5b1c37a 100644 + class {"opendaylight": + extra_features => ['odl-ovsdb-openstack'], + odl_rest_port => hiera('opendaylight_port'), ++ enable_l3 => hiera('opendaylight_enable_l3', 'no'), + } + } + @@ -556,7 +671,7 @@ index 863cc5f..5b1c37a 100644 exec { 'galera-ready' : command => '/usr/bin/clustercheck >/dev/null', timeout => 30, -@@ -584,7 +598,14 @@ if hiera('step') >= 3 { +@@ -584,7 +599,14 @@ if hiera('step') >= 3 { include ::nova::network::neutron # Neutron class definitions @@ -572,7 +687,7 @@ index 863cc5f..5b1c37a 100644 class { '::neutron::server' : sync_db => $sync_db, manage_service => false, -@@ -595,10 +616,6 @@ if hiera('step') >= 3 { +@@ -594,10 +616,6 @@ if hiera('step') >= 3 { manage_service => false, enabled => false, } @@ -583,7 +698,7 @@ index 863cc5f..5b1c37a 100644 class { '::neutron::agents::metadata': manage_service => false, enabled => false, -@@ -610,18 +627,66 @@ if hiera('step') >= 3 { +@@ -609,18 +627,68 @@ if hiera('step') >= 3 { notify => Service['neutron-dhcp-service'], require => Package['neutron'], } @@ -616,7 +731,7 @@ index 863cc5f..5b1c37a 100644 + odl_password => hiera('opendaylight_password'), + odl_port => hiera('opendaylight_port'), + } -+ + + if str2bool(hiera('opendaylight_install', 'false')) { + class { 'neutron::plugins::ovs::opendaylight': + odl_controller_ip => $opendaylight_controller_ip, @@ -626,9 +741,11 @@ index 863cc5f..5b1c37a 100644 + odl_password => hiera('opendaylight_password'), + } + } -+ class { '::neutron::agents::l3' : -+ manage_service => false, -+ enabled => false, ++ if ! str2bool(hiera('opendaylight_enable_l3', 'no')) { ++ class { '::neutron::agents::l3' : ++ manage_service => false, ++ enabled => false, ++ } + } + } elsif 'onos_ml2' in hiera('neutron_mechanism_drivers') { + #config ml2_conf.ini with onos url address @@ -640,7 +757,7 @@ index 863cc5f..5b1c37a 100644 + 'onos/password': value => 'admin'; + 'onos/url_path': value => "http://${controller_node_ips[0]}:${onos_port}/onos/vtn"; + } - ++ + } else { + class { '::neutron::agents::l3' : + manage_service => false, @@ -656,22 +773,22 @@ index 863cc5f..5b1c37a 100644 if 'cisco_ucsm' in hiera('neutron_mechanism_drivers') { include ::neutron::plugins::ml2::cisco::ucsm } -@@ -646,8 +711,10 @@ if hiera('step') >= 3 { +@@ -645,8 +713,10 @@ if hiera('step') >= 3 { if hiera('neutron_enable_bigswitch_ml2', false) { include ::neutron::plugins::ml2::bigswitch::restproxy } - neutron_l3_agent_config { - 'DEFAULT/ovs_use_veth': value => hiera('neutron_ovs_use_veth', false); -+ if !('onos_ml2' in hiera('neutron_mechanism_drivers')) { ++ if !('onos_ml2' in hiera('neutron_mechanism_drivers') or str2bool(hiera('opendaylight_enable_l3', 'no'))) { + neutron_l3_agent_config { + 'DEFAULT/ovs_use_veth': value => hiera('neutron_ovs_use_veth', false); + } } neutron_dhcp_agent_config { 'DEFAULT/ovs_use_veth': value => hiera('neutron_ovs_use_veth', false); -@@ -1073,62 +1140,21 @@ if hiera('step') >= 4 { - require => Pacemaker::Resource::Service[$::keystone::params::service_name] - } +@@ -1055,62 +1125,21 @@ if hiera('step') >= 4 { + clone_params => 'interleave=true', + require => Pacemaker::Resource::Service[$::keystone::params::service_name], } - pacemaker::resource::service { $::neutron::params::l3_agent_service: - clone_params => 'interleave=true', @@ -736,7 +853,7 @@ index 863cc5f..5b1c37a 100644 pacemaker::constraint::base { 'keystone-to-neutron-server-constraint': constraint_type => 'order', first_resource => "${::keystone::params::service_name}-clone", -@@ -1138,65 +1164,110 @@ if hiera('step') >= 4 { +@@ -1120,65 +1149,110 @@ if hiera('step') >= 4 { require => [Pacemaker::Resource::Service[$::keystone::params::service_name], Pacemaker::Resource::Service[$::neutron::params::server_service]], } @@ -865,7 +982,7 @@ index 863cc5f..5b1c37a 100644 - score => 'INFINITY', - require => [Pacemaker::Resource::Service[$::neutron::params::l3_agent_service], - Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service]], -+ if !('onos_ml2' in hiera('neutron_mechanism_drivers')) { ++ if !('onos_ml2' in hiera('neutron_mechanism_drivers') or str2bool(hiera('opendaylight_enable_l3', 'no'))) { + pacemaker::constraint::base { 'neutron-dhcp-agent-to-l3-agent-constraint': + constraint_type => 'order', + first_resource => "${::neutron::params::dhcp_agent_service}-clone", @@ -897,7 +1014,7 @@ index 863cc5f..5b1c37a 100644 + score => 'INFINITY', + require => [Pacemaker::Resource::Service[$::neutron::params::l3_agent_service], + Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service]], -+ } ++ } } - # Nova @@ -905,10 +1022,10 @@ index 863cc5f..5b1c37a 100644 clone_params => 'interleave=true', diff --git a/puppet/manifests/overcloud_opendaylight.pp b/puppet/manifests/overcloud_opendaylight.pp new file mode 100644 -index 0000000..aea6568 +index 0000000..33f609a --- /dev/null +++ b/puppet/manifests/overcloud_opendaylight.pp -@@ -0,0 +1,26 @@ +@@ -0,0 +1,27 @@ +# Copyright 2015 Red Hat, Inc. +# All Rights Reserved. +# @@ -933,14 +1050,15 @@ index 0000000..aea6568 +class {"opendaylight": + extra_features => ['odl-ovsdb-openstack'], + odl_rest_port => hiera('opendaylight_port'), ++ enable_l3 => hiera('opendaylight_enable_l3', 'no'), +} + diff --git a/puppet/opendaylight-puppet.yaml b/puppet/opendaylight-puppet.yaml new file mode 100644 -index 0000000..70f2543 +index 0000000..b876dc7 --- /dev/null +++ b/puppet/opendaylight-puppet.yaml -@@ -0,0 +1,209 @@ +@@ -0,0 +1,217 @@ +heat_template_version: 2015-04-30 + +description: > @@ -968,6 +1086,10 @@ index 0000000..70f2543 + description: The admin password for the OpenDaylight node + type: string + hidden: true ++ OpenDaylightEnableL3: ++ description: Knob to enable/disable ODL L3 ++ type: string ++ default: 'no' + OpenDaylightPort: + default: 8081 + description: Set OpenDaylight service port @@ -1066,6 +1188,9 @@ index 0000000..70f2543 + params: + server: {get_param: NtpServer} + opendaylight_port: {get_param: OpenDaylightPort} ++ opendaylight_enable_l3: {get_param: OpenDaylightEnableL3} ++ opendaylight_username: {get_param: OpenDaylightUsername} ++ opendaylight_password: {get_param: OpenDaylightPassword} + + OpenDaylightConfig: + type: OS::Heat::StructuredConfig @@ -1090,6 +1215,7 @@ index 0000000..70f2543 + opendaylight::admin_username: {get_param: OpenDaylightUsername} + opendaylight::admin_password: {get_param: OpenDaylightPassword} + opendaylight_port: {get_input: opendaylight_port} ++ opendaylight_enable_l3: {get_input: opendaylight_enable_l3} + ceph: + raw_data: {get_file: hieradata/ceph.yaml} + |