diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-20 01:15:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-20 01:15:01 +0000 |
| commit | 82d83da33667f87fb8330acbbd03924e5b756458 (patch) | |
| tree | 4efe63ef3c08b6cf33f90d99419a52d5513db2b5 /puppet/services/neutron-plugin-nuage.yaml | |
| parent | 2f2327236ea1c794e942b347e7bcf2110def151f (diff) | |
| parent | 37a8eaff4c8516ed58c7b9789d5b8bd33948c155 (diff) | |
Merge "Addition of firewall rules for Nuage" into stable/ocata
Diffstat (limited to 'puppet/services/neutron-plugin-nuage.yaml')
| -rw-r--r-- | puppet/services/neutron-plugin-nuage.yaml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/puppet/services/neutron-plugin-nuage.yaml b/puppet/services/neutron-plugin-nuage.yaml index e09cd704..6229a3f1 100644 --- a/puppet/services/neutron-plugin-nuage.yaml +++ b/puppet/services/neutron-plugin-nuage.yaml @@ -19,10 +19,6 @@ parameters: via parameter_defaults in the resource registry. type: json # Config specific parameters, to be provided via parameter_defaults - NeutronNuageOSControllerIp: - description: IP address of the OpenStack Controller - type: string - NeutronNuageNetPartitionName: description: Specifies the title that you will see on the VSD type: string @@ -76,8 +72,7 @@ outputs: config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] - - neutron::plugins::nuage::nuage_oscontroller_ip: {get_param: NeutronNuageOSControllerIp} - neutron::plugins::nuage::nuage_net_partition_name: {get_param: NeutronNuageNetPartitionName} + - neutron::plugins::nuage::nuage_net_partition_name: {get_param: NeutronNuageNetPartitionName} neutron::plugins::nuage::nuage_vsd_ip: {get_param: NeutronNuageVSDIp} neutron::plugins::nuage::nuage_vsd_username: {get_param: NeutronNuageVSDUsername} neutron::plugins::nuage::nuage_vsd_password: {get_param: NeutronNuageVSDPassword} |