Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add options to configure some services with SSL #23

Closed
wants to merge 27 commits into from
Closed

Add options to configure some services with SSL #23

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c073057
WIP: Add cisco plugin support to neutron classes
Oct 3, 2013
25d9962
Include user exposed params for ovs/cisco plugin in seeds file
Oct 4, 2013
e54f96d
refactor to separate out the plugin code into its own component
Oct 4, 2013
5ca139a
adding right defaults to params, remove unused params and some copyri…
Oct 8, 2013
d0b0a4a
Add provider vlan options
Oct 8, 2013
decf608
rebase resolve merge conflicts
Oct 9, 2013
95380c5
include nexus_config as part of params
Oct 11, 2013
5790e4a
Merge remote-tracking branch 'upstream/master'
Oct 15, 2013
b61f0d2
Fix various minor bugs uncovered during testing
Oct 15, 2013
83b78bf
Use FQDN rather than IP addresses to reference hosts.
rcritten Oct 15, 2013
8f98baf
Add options for SSL support either via files or FreeIPA
rcritten Oct 15, 2013
52d7156
expose params via seeds to override, set the bridge params for compute
Oct 17, 2013
518d736
Don't enable SSL by default
rcritten Oct 23, 2013
148a9cb
rebase master
Oct 25, 2013
98d3f48
Revert the IP to FQDN change and instead let the user decide.
rcritten Oct 25, 2013
cdbefae
Merge pull request #22 from pkilambi/master
jguiditta Oct 25, 2013
2136c34
Merge pull request #30 from jguiditta/mysql_firewall_rule
cwolferh Oct 25, 2013
47e5465
Configure Horizon to use SSL when ssl is true in the controller
rcritten Oct 29, 2013
b42e9e4
Added external ovs bridge creation.
gildub Oct 28, 2013
e2db3e5
Use FQDN rather than IP addresses to reference hosts.
rcritten Oct 15, 2013
be5b18f
Add options for SSL support either via files or FreeIPA
rcritten Oct 15, 2013
ad78935
Don't enable SSL by default
rcritten Oct 23, 2013
e9d19c6
Revert the IP to FQDN change and instead let the user decide.
rcritten Oct 25, 2013
014c5be
Configure Horizon to use SSL when ssl is true in the controller
rcritten Oct 29, 2013
7389372
Restore correct floating ip address variable names
rcritten Nov 4, 2013
eadc028
Merge branch 'master' of https://github.com/rcritten/astapor
rcritten Nov 4, 2013
b569f61
Fix up some other names
rcritten Nov 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adding right defaults to params, remove unused params and some copyri… 
…ght info added
  • Loading branch information
Pradeep Kilambi committed Oct 8, 2013
commit 5ca139ad16c8b9139ef6456be68b67ae605097ff
12 changes: 6 additions & 6 deletions bin/seeds.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,15 +261,15 @@
"metadata_proxy_shared_secret" => SecureRandom.hex,
"bridge_interface" => private_int,
"enable_ovs_agent" => "true",
"ovs_vlan_ranges" => undef,
"ovs_bridge_mappings" => [undef],
"ovs_bridge_uplinks" => [undef],
"tenant_network_type" => 'vlan',
"ovs_vlan_ranges" => nil,
"ovs_bridge_mappings" => nil,
"ovs_bridge_uplinks" => nil,
"tenant_network_type" => 'gre',
"neutron_core_plugin" => 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2',
"cisco_vswitch_plugin" => 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2',
"cisco_nexus_plugin" => 'neutron.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin',
"nexus_credentials" => ['1.1.1.1/nexus_username1/secret1',
'2.2.2.2/nexus_username2/secret2']
"nexus_credentials" => nil #['1.1.1.1/nexus_username1/secret1',
# '2.2.2.2/nexus_username2/secret2']
}

hostgroups = [
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/quickstack/manifests/neutron/controller.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
}

if $neutron_core_plugin == 'neutron.plugins.cisco.network_plugin.PluginV2' {
class quickstack::neutron::plugins::cisco { }
class { 'quickstack::neutron::plugins::cisco': }
}

class { '::nova::network::neutron':
Expand Down
21 changes: 17 additions & 4 deletions puppet/modules/quickstack/manifests/neutron/plugins/cisco.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
# Copyright 2013 Cisco Systems, Inc. All rights reserved.
#
# 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
#
# https://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.
#
# @author: Pradeep Kilambi, Cisco Systems, Inc.

class quickstack::neutron::plugins::cisco (
# Set DHCP/L3 Agents on Primary Controller
$enable_ovs_agent = false,
$enable_dhcp_agent = false,
$enable_l3_agent = false,
$enable_metadata_agent = false,
$enable_server = true,
$neutron_db_password = $quickstack::params::neutron_db_password,
$neutron_user_password = $quickstack::params::neutron_user_password,
Expand Down Expand Up @@ -52,7 +65,7 @@
ensure => installed,
} ~> Service['neutron']

neutron_plugin_cisco<||> ->
Neutron_plugin_cisco<||> ->
file {'/etc/neutron/plugins/cisco/cisco_plugins.ini':
owner => 'root',
group => 'root',
Expand Down