summaryrefslogtreecommitdiffstats
path: root/common/puppet-opnfv
diff options
context:
space:
mode:
authorFrank Brockners <fbrockne@cisco.com>2015-04-10 18:48:27 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-04-10 18:48:27 +0000
commit5ce8b661ea230f0823ebdfcbee19a2b1cf60ae32 (patch)
treede6c01d2b9d8cc79955180b0a3d55610406d712e /common/puppet-opnfv
parentdaacb18e3f99da06ae5c7e1e87c964233a8fc796 (diff)
parent48942bded0504d3269c2e0d9c232452a5f1acc69 (diff)
Merge "Adds Ceph cluster creation for controllers PATCHSET3: fixes whitepsace"
Diffstat (limited to 'common/puppet-opnfv')
-rw-r--r--common/puppet-opnfv/manifests/controller_networker.pp28
1 files changed, 24 insertions, 4 deletions
diff --git a/common/puppet-opnfv/manifests/controller_networker.pp b/common/puppet-opnfv/manifests/controller_networker.pp
index c4e7423..6888850 100644
--- a/common/puppet-opnfv/manifests/controller_networker.pp
+++ b/common/puppet-opnfv/manifests/controller_networker.pp
@@ -20,11 +20,11 @@
class opnfv::controller_networker {
if $odl_rest_port == '' { $odl_rest_port= '8081'}
- if ($odl_flag != '') and str2bool($odl_flag) {
+ if ($odl_flag != '') and str2bool($odl_flag) {
$ml2_mech_drivers = ['opendaylight']
$this_agent = 'opendaylight'
} else {
- $ml2_mech_drivers = ['openvswitch','l2population']
+ $ml2_mech_drivers = ['openvswitch','l2population']
$this_agent = 'ovs'
}
@@ -46,8 +46,10 @@ class opnfv::controller_networker {
if $ha_flag and str2bool($ha_flag) {
##Mandatory HA variables
if !$controllers_ip_array { fail('controllers_ip_array is empty') }
+ $controllers_ip_array_str = $controllers_ip_array
$controllers_ip_array = split($controllers_ip_array, ',')
if !$controllers_hostnames_array { fail('controllers_hostnames_array is empty') }
+ $controllers_hostnames_array_str = $controllers_hostnames_array
$controllers_hostnames_array = split($controllers_hostnames_array, ',')
if !$amqp_vip { fail('amqp_vip is empty') }
if !$private_subnet { fail('private_subnet is empty')}
@@ -100,12 +102,30 @@ class opnfv::controller_networker {
if !$pcmk_server_addrs {$pcmk_server_addrs = $controllers_ip_array}
if !$pcmk_server_names {$pcmk_server_names = ["pcmk-${controllers_hostnames_array[0]}", "pcmk-${controllers_hostnames_array[1]}", "pcmk-${controllers_hostnames_array[2]}"] }
if !$rbd_secret_uuid { $rbd_secret_uuid = '3b519746-4021-4f72-957e-5b9d991723be' }
+ if !$storage_iface { $storage_iface = $ovs_tunnel_if }
##we assume here that if not provided, the first controller is where ODL will reside
##this is fine for now as we will replace ODL with ODL HA when it is ready
if $odl_control_ip == '' { $odl_control_ip = $controllers_ip_array[0] }
-
+ ###find interface ip of storage network
+ $osd_ip = find_ip("",
+ "$storage_iface",
+ "")
+
+ class { "opnfv::ceph_deploy":
+ fsid => $ceph_fsid,
+ osd_pool_default_size => $ceph_osd_pool_size,
+ osd_journal_size => $ceph_osd_journal_size,
+ mon_initial_members => $controllers_hostnames_array_str,
+ mon_host => $controllers_ip_array_str,
+ osd_ip => $osd_ip,
+ public_network => $ceph_public_network,
+ cluster_network => $ceph_public_network,
+ images_key => $ceph_images_key,
+ volumes_key => $ceph_volumes_key,
+ }
+ ->
class { "quickstack::openstack_common": }
->
class { "quickstack::pacemaker::params":
@@ -346,7 +366,7 @@ class opnfv::controller_networker {
horizon_ca => $quickstack::params::horizon_ca,
horizon_cert => $quickstack::params::horizon_cert,
horizon_key => $quickstack::params::horizon_key,
-
+
ml2_mechanism_drivers => $ml2_mech_drivers,
#neutron => true,