summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlokesh-jain <lokesh.jain@gmail.com>2017-04-03 16:32:53 -0400
committerAlex Schultz <aschultz@redhat.com>2017-06-07 20:20:41 +0000
commit0eb81a20ce0976642324814e83b9af211b48c9c7 (patch)
tree06a8e44c25cd1a7c15bc7b8573448a9826f18cec
parentdc505cec78fbbb0a21c3503860737a7f65cec31b (diff)
Addition of firewall rules for Nuage
Added VxLAN and metadata agent firewall rules to neutron-compute-plugin for Nuage. Removed a deprecated parameter 'OSControllerIp' as well. Change-Id: If10c300db48c66b9ebeaf74b5f5fee9132e75366 (cherry picked from commit d5309c9443cbfe50ba5e7c15f025393a58b0804c)
Notes
Notes (review): Code-Review+2: Alex Schultz <aschultz@redhat.com> Workflow+1: Alex Schultz <aschultz@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 08 Jun 2017 13:56:32 +0000 Reviewed-on: https://review.openstack.org/462286 Project: openstack/tripleo-heat-templates Branch: refs/heads/stable/newton
-rw-r--r--environments/neutron-nuage-config.yaml1
-rw-r--r--puppet/services/neutron-compute-plugin-nuage.yaml10
-rw-r--r--puppet/services/neutron-plugin-nuage.yaml7
3 files changed, 11 insertions, 7 deletions
diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index 7489924..601554a 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -10,7 +10,6 @@ resource_registry:
10 OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-nuage.yaml 10 OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-nuage.yaml
11 11
12parameter_defaults: 12parameter_defaults:
13 NeutronNuageOSControllerIp: '0.0.0.0'
14 NeutronNuageNetPartitionName: 'default_name' 13 NeutronNuageNetPartitionName: 'default_name'
15 NeutronNuageVSDIp: '0.0.0.0:0' 14 NeutronNuageVSDIp: '0.0.0.0:0'
16 NeutronNuageVSDUsername: 'username' 15 NeutronNuageVSDUsername: 'username'
diff --git a/puppet/services/neutron-compute-plugin-nuage.yaml b/puppet/services/neutron-compute-plugin-nuage.yaml
index c4f8ad1..fa2ea56 100644
--- a/puppet/services/neutron-compute-plugin-nuage.yaml
+++ b/puppet/services/neutron-compute-plugin-nuage.yaml
@@ -22,6 +22,10 @@ parameters:
22 description: The password for the nova service account, used by nova-api. 22 description: The password for the nova service account, used by nova-api.
23 type: string 23 type: string
24 hidden: true 24 hidden: true
25 NuageMetadataPort:
26 description: TCP Port to listen for metadata server requests
27 type: string
28 default: '9697'
25 29
26outputs: 30outputs:
27 role_data: 31 role_data:
@@ -32,5 +36,11 @@ outputs:
32 tripleo::profile::base::neutron::agents::nuage::nova_os_tenant_name: 'service' 36 tripleo::profile::base::neutron::agents::nuage::nova_os_tenant_name: 'service'
33 tripleo::profile::base::neutron::agents::nuage::nova_os_password: {get_param: NovaPassword} 37 tripleo::profile::base::neutron::agents::nuage::nova_os_password: {get_param: NovaPassword}
34 tripleo::profile::base::neutron::agents::nuage::nova_auth_ip: {get_param: [EndpointMap, KeystoneInternal, host]} 38 tripleo::profile::base::neutron::agents::nuage::nova_auth_ip: {get_param: [EndpointMap, KeystoneInternal, host]}
39 tripleo.neutron_compute_plugin_nuage.firewall_rules:
40 '118 neutron vxlan networks':
41 proto: 'udp'
42 dport: 4789
43 '100 metadata agent':
44 dport: {get_param: NuageMetadataPort}
35 step_config: | 45 step_config: |
36 include ::tripleo::profile::base::neutron::agents::nuage 46 include ::tripleo::profile::base::neutron::agents::nuage
diff --git a/puppet/services/neutron-plugin-nuage.yaml b/puppet/services/neutron-plugin-nuage.yaml
index 838ec5e..3576668 100644
--- a/puppet/services/neutron-plugin-nuage.yaml
+++ b/puppet/services/neutron-plugin-nuage.yaml
@@ -19,10 +19,6 @@ parameters:
19 via parameter_defaults in the resource registry. 19 via parameter_defaults in the resource registry.
20 type: json 20 type: json
21 # Config specific parameters, to be provided via parameter_defaults 21 # Config specific parameters, to be provided via parameter_defaults
22 NeutronNuageOSControllerIp:
23 description: IP address of the OpenStack Controller
24 type: string
25
26 NeutronNuageNetPartitionName: 22 NeutronNuageNetPartitionName:
27 description: Specifies the title that you will see on the VSD 23 description: Specifies the title that you will see on the VSD
28 type: string 24 type: string
@@ -76,8 +72,7 @@ outputs:
76 config_settings: 72 config_settings:
77 map_merge: 73 map_merge:
78 - get_attr: [NeutronBase, role_data, config_settings] 74 - get_attr: [NeutronBase, role_data, config_settings]
79 - neutron::plugins::nuage::nuage_oscontroller_ip: {get_param: NeutronNuageOSControllerIp} 75 - neutron::plugins::nuage::nuage_net_partition_name: {get_param: NeutronNuageNetPartitionName}
80 neutron::plugins::nuage::nuage_net_partition_name: {get_param: NeutronNuageNetPartitionName}
81 neutron::plugins::nuage::nuage_vsd_ip: {get_param: NeutronNuageVSDIp} 76 neutron::plugins::nuage::nuage_vsd_ip: {get_param: NeutronNuageVSDIp}
82 neutron::plugins::nuage::nuage_vsd_username: {get_param: NeutronNuageVSDUsername} 77 neutron::plugins::nuage::nuage_vsd_username: {get_param: NeutronNuageVSDUsername}
83 neutron::plugins::nuage::nuage_vsd_password: {get_param: NeutronNuageVSDPassword} 78 neutron::plugins::nuage::nuage_vsd_password: {get_param: NeutronNuageVSDPassword}