summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-19 15:26:41 +0000
committerGerrit Code Review <review@openstack.org>2017-06-19 15:26:41 +0000
commitf3e084dc85c0d95fadd078c6297a40136779ee5c (patch)
tree6f6d71490cdb09722680612d25ce0d0a9b980d8b
parent96813ba2683552860c68d99931aa77cd6a0bf391 (diff)
parent7613306b8cb67547cc9f0c56f9ba97a45a9e7f73 (diff)
Merge "Add neutron-midonet sample environment"
-rw-r--r--environments/networking/neutron-midonet.yaml66
-rw-r--r--environments/neutron-midonet.yaml4
-rw-r--r--sample-env-generator/networking.yaml32
3 files changed, 102 insertions, 0 deletions
diff --git a/environments/networking/neutron-midonet.yaml b/environments/networking/neutron-midonet.yaml
new file mode 100644
index 0000000..ad8da8c
--- /dev/null
+++ b/environments/networking/neutron-midonet.yaml
@@ -0,0 +1,66 @@
1# *******************************************************************
2# This file was created automatically by the sample environment
3# generator. Developers should use `tox -e genconfig` to update it.
4# Users are recommended to make changes to a copy of the file instead
5# of the original, if any customizations are needed.
6# *******************************************************************
7# title: Enable the Neutron MidoNet Services
8# description: |
9# A Heat environment that can be used to deploy MidoNet Services
10parameter_defaults:
11 # Native Transport Port
12 # Type: string
13 CassandraClientPort: 9042
14
15 # The port for the Thrift RPC service, which is used for client connections
16 # Type: string
17 CassandraClientPortThrift: 9160
18
19 # The SSL port for encrypted communication. Unused unless enabled in encryption_options
20 # Type: string
21 CassandraSslStoragePort: 7001
22
23 # The Cassandra port for inter-node communication
24 # Type: string
25 CassandraStoragePort: 7000
26
27 # Name of the tunnel zone used to tunnel packages
28 # Type: string
29 TunnelZoneName: tunnelzone_tripleo
30
31 # Type of the tunnels on the overlay. Choose between `gre` and `vxlan`
32 # Type: string
33 TunnelZoneType: vxlan
34
35 # ******************************************************
36 # Static parameters - these are values that must be
37 # included in the environment but should not be changed.
38 # ******************************************************
39 # Whether enable Cassandra cluster on Controller
40 # Type: boolean
41 EnableCassandraOnController: True
42
43 # Whether enable Zookeeper cluster on Controller
44 # Type: boolean
45 EnableZookeeperOnController: True
46
47 # The core plugin for Neutron. The value should be the entrypoint to be loaded
48 # from neutron.core_plugins namespace.
49 # Type: string
50 NeutronCorePlugin: midonet.neutron.plugin_v1.MidonetPluginV2
51
52 # If True, DHCP provide metadata route to VM.
53 # Type: boolean
54 NeutronEnableIsolatedMetadata: True
55
56 # *********************
57 # End static parameters
58 # *********************
59resource_registry:
60 OS::TripleO::AllNodesExtraConfig: ../../puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
61 OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-linux-bridge.yaml
62 OS::TripleO::Services::ComputeNeutronCorePlugin: ../../puppet/services/neutron-compute-plugin-midonet.yaml
63 OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
64 OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginMidonet
65 OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
66 OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
diff --git a/environments/neutron-midonet.yaml b/environments/neutron-midonet.yaml
index c120d0b..64cea2a 100644
--- a/environments/neutron-midonet.yaml
+++ b/environments/neutron-midonet.yaml
@@ -1,3 +1,7 @@
1# ******************************************************************************
2# DEPRECATED: Use tripleo-heat-templates/environments/networking/neutron-midonet
3# instead.
4# ******************************************************************************
1# A Heat environment that can be used to deploy MidoNet Services 5# A Heat environment that can be used to deploy MidoNet Services
2resource_registry: 6resource_registry:
3 OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml 7 OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
diff --git a/sample-env-generator/networking.yaml b/sample-env-generator/networking.yaml
new file mode 100644
index 0000000..ea7042b
--- /dev/null
+++ b/sample-env-generator/networking.yaml
@@ -0,0 +1,32 @@
1environments:
2 -
3 name: networking/neutron-midonet
4 title: Enable the Neutron MidoNet Services
5 description: A Heat environment that can be used to deploy MidoNet Services
6 files:
7 puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml:
8 parameters: all
9 puppet/services/neutron-base.yaml:
10 parameters:
11 - NeutronCorePlugin
12 puppet/services/neutron-dhcp.yaml:
13 parameters:
14 - NeutronEnableIsolatedMetadata
15 sample_values:
16 NeutronCorePlugin: 'midonet.neutron.plugin_v1.MidonetPluginV2'
17 NeutronEnableIsolatedMetadata: true
18 EnableZookeeperOnController: true
19 EnableCassandraOnController: true
20 static:
21 - NeutronCorePlugin
22 - NeutronEnableIsolatedMetadata
23 - EnableZookeeperOnController
24 - EnableCassandraOnController
25 resource_registry:
26 OS::TripleO::AllNodesExtraConfig: ../../puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
27 OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-linux-bridge.yaml
28 OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
29 OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
30 OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
31 OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginMidonet
32 OS::TripleO::Services::ComputeNeutronCorePlugin: ../../puppet/services/neutron-compute-plugin-midonet.yaml