diff options
-rw-r--r-- | .gitreview | 5 | ||||
-rw-r--r-- | environments/enable_barometer.yaml | 16 | ||||
-rw-r--r-- | environments/neutron-bgpvpn-opendaylight.yaml | 8 | ||||
-rw-r--r-- | environments/neutron-bgpvpn.yaml | 2 | ||||
-rw-r--r-- | environments/neutron-l2gw-opendaylight.yaml | 2 | ||||
-rw-r--r-- | environments/neutron-ml2-vpp.yaml | 10 | ||||
-rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 1 | ||||
-rw-r--r-- | puppet/role.role.j2.yaml | 1 | ||||
-rw-r--r-- | puppet/services/barometer.yaml | 65 |
9 files changed, 99 insertions, 11 deletions
@@ -1,5 +1,4 @@ [gerrit] -host=review.openstack.org +host=gerrit.opnfv.org port=29418 -project=openstack/tripleo-heat-templates.git -defaultbranch=stable/pike +project=apex-tripleo-heat-templates.git diff --git a/environments/enable_barometer.yaml b/environments/enable_barometer.yaml new file mode 100644 index 00000000..ea10c166 --- /dev/null +++ b/environments/enable_barometer.yaml @@ -0,0 +1,16 @@ +# Copyright 2015-2018 Intel Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +resource_registry: + OS::TripleO::Services::Barometer: ../puppet/services/barometer.yaml diff --git a/environments/neutron-bgpvpn-opendaylight.yaml b/environments/neutron-bgpvpn-opendaylight.yaml index 1d2e0774..c381669b 100644 --- a/environments/neutron-bgpvpn-opendaylight.yaml +++ b/environments/neutron-bgpvpn-opendaylight.yaml @@ -3,10 +3,12 @@ # This environment file deploys Neutron BGPVPN service and configures # Opendaylight as its service provider. # -# - OpenDaylight: BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default +# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default +# - NeutronServicePlugins: odl-router_v2, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin + resource_registry: OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml parameter_defaults: - NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin' - BgpvpnServiceProvider: 'BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default' + NeutronServicePlugins: 'odl-router_v2,trunk,bgpvpn' + BgpvpnServiceProvider: 'BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default' diff --git a/environments/neutron-bgpvpn.yaml b/environments/neutron-bgpvpn.yaml index 2a632480..e648f019 100644 --- a/environments/neutron-bgpvpn.yaml +++ b/environments/neutron-bgpvpn.yaml @@ -6,7 +6,7 @@ # # - Bagpipe: BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default # - OpenContrail: BGPVPN:OpenContrail:networking_bgpvpn.neutron.services.service_drivers.opencontrail.opencontrail.OpenContrailBGPVPNDriver:default -# - OpenDaylight: BGPVPN:OpenDaylight:networking_bgpvpn.neutron.services.service_drivers.opendaylight.odl.OpenDaylightBgpvpnDriver:default +# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default # - Nuage: BGPVPN:Nuage:nuage_neutron.bgpvpn.services.service_drivers.driver.NuageBGPVPNDriver:default resource_registry: OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml diff --git a/environments/neutron-l2gw-opendaylight.yaml b/environments/neutron-l2gw-opendaylight.yaml index 2168dbc3..3ee9de77 100644 --- a/environments/neutron-l2gw-opendaylight.yaml +++ b/environments/neutron-l2gw-opendaylight.yaml @@ -8,7 +8,7 @@ resource_registry: OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml parameter_defaults: - NeutronServicePlugins: "networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin" + NeutronServicePlugins: "odl-router_v2,trunk,networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin" L2gwServiceProvider: ['L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default'] # Optional diff --git a/environments/neutron-ml2-vpp.yaml b/environments/neutron-ml2-vpp.yaml index 1dec395c..ade976d9 100644 --- a/environments/neutron-ml2-vpp.yaml +++ b/environments/neutron-ml2-vpp.yaml @@ -6,6 +6,7 @@ resource_registry: OS::TripleO::Services::NeutronVppAgent: ../puppet/services/neutron-vpp-agent.yaml OS::TripleO::Services::Etcd: ../puppet/services/etcd.yaml OS::TripleO::Services::Vpp: ../puppet/services/vpp.yaml + OS::TripleO::Services::NeutronL3Agent: OS::Heat::None parameter_defaults: #Comma delimited list of <physical_network>:<VPP Interface>. @@ -14,9 +15,12 @@ parameter_defaults: NeutronMechanismDrivers: vpp NeutronNetworkType: vlan - NeutronServicePlugins: router + NeutronServicePlugins: vpp-router NeutronTypeDrivers: vlan,flat + NeutronFlatNetworks: external ExtraConfig: - # Use Linux Bridge driver for DHCP and L3 agent. + # Use Linux Bridge driver for DHCP agent. neutron::agents::dhcp::interface_driver: "neutron.agent.linux.interface.BridgeInterfaceDriver" - neutron::agents::l3::interface_driver: "neutron.agent.linux.interface.BridgeInterfaceDriver" + # Create VPP tap0 interface and connect it to br-ex linux bridge for external connectivity. + fdio::vpp_exec_commands: ["create tap host-if-name vpp_ext_tap host-bridge br-ex rx-ring-size 1024 tx-ring-size 1024", "set interface state tap0 up"] + diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 3ee77218..f03c975e 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -114,6 +114,7 @@ resource_registry: # services OS::TripleO::Services: common/services.yaml OS::TripleO::Services::Apache: puppet/services/apache.yaml + OS::TripleO::Services::Barometer: OS::Heat::None OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml OS::TripleO::Services::CephMds: OS::Heat::None OS::TripleO::Services::CephMon: OS::Heat::None diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index a3cbe851..6e34cf76 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -582,6 +582,7 @@ resources: - cisco_n1kv_data # Optionally provided by Controller/ComputeExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - cisco_aci_data # Optionally provided by Controller/ComputeExtraConfigPre + - common # Optionally provided by os-net-config merge_behavior: deeper datafiles: service_names: diff --git a/puppet/services/barometer.yaml b/puppet/services/barometer.yaml new file mode 100644 index 00000000..fbd6d5da --- /dev/null +++ b/puppet/services/barometer.yaml @@ -0,0 +1,65 @@ +# Copyright 2017-2018 Intel Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +heat_template_version: 2014-10-16 + +description: > + Install Barometer (Fastpath Quality Metrics = collectd with RDT) on compute nodes + +# Note extra parameters can be defined, then passed data via the +# environment parameter_defaults, without modifying the parent template +parameters: + ServiceData: + default: {} + description: Dictionary packing service data + type: json + ServiceNetMap: + default: {} + description: Mapping of service_name -> network name. Typically set + via parameter_defaults in the resource registry. This + mapping overrides those in ServiceNetMapDefaults. + type: json + DefaultPasswords: + default: {} + type: json + RoleName: + default: '' + description: Role name on which the service is applied + type: string + RoleParameters: + default: {} + description: Parameters specific to the role + type: json + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + GnocchiPassword: + description: The password for the gnocchi service and db account. + type: string + hidden: true + +outputs: + role_data: + description: Role data for Barometer role. + value: + service_name: barometer + config_settings: + barometer::collectd::collectd_password: {get_param: GnocchiPassword} + barometer::collectd::collectd_username: 'gnocchi' + barometer::collectd::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + step_config: | + include ::tripleo::profile::base::barometer + |