Use hiera vars in openbsc

modules/rhizo_base/manifests/init.pp

@@ -61,7 +61,8 @@ class rhizo_base {
   $arfcn_F         = hiera('rhizo::arfcn_F', false)
   $bts3_name       = hiera('rhizo::bts3_name', "${site_name}_3")
 
-  $max_power_red   = hiera('rhizo::max_power_red')
+  $ms_max_power    = hiera('rhizo::ms_max_power', '5')
+  $max_power_red   = hiera('rhizo::max_power_red', '24')
   $mncc_codec      = hiera('rhizo::mncc_codec', 'GSM')
   $inter_codec     = hiera('rhizo::inter_codec', 'G729')
 

modules/rhizo_base/manifests/openbsc.pp

@@ -14,6 +14,7 @@ class rhizo_base::openbsc {
   $network_name    = $rhizo_base::network_name
   $auth_policy     = $rhizo_base::auth_policy
   $lac             = $rhizo_base::lac
+  $ms_max_power    = $rhizo_base::ms_max_power
   $max_power_red   = $rhizo_base::max_power_red
   $gsm_band        = $rhizo_base::gsm_band
   $mcc             = $rhizo_base::mcc

modules/rhizo_base/templates/osmo-nitb.cfg.erb

@@ -69,7 +69,7 @@ network
  mobile network code <%= @mnc %>
  short name <%= @network_name %>
  long name <%= @network_name %>
- auth policy closed
+ auth policy <%= @auth_policy %>
  authorized-regexp .*
  location updating reject cause 13
  encryption a5 0
@@ -94,7 +94,7 @@ network
   cell_identity 0
   location_area_code <%= @lac %>
   base_station_id_code 63
-  ms max power 5
+  ms max power <%= @ms_max_power %>
   cell reselection hysteresis 14
   rxlev access min 0
   periodic location update 30
@@ -153,7 +153,7 @@ network
    rf_locked 0
    arfcn <%= @arfcn_A %>
    nominal power 37
-   max_power_red 24
+   max_power_red <%= @max_power_red %>
    rsl e1 tei 0
    timeslot 0
     phys_chan_config CCCH
@@ -186,7 +186,7 @@ network
   cell_identity 1
   location_area_code <%= @lac %>
   base_station_id_code 63
-  ms max power 33
+  ms max power <%= @ms_max_power %>
   cell reselection hysteresis 14
   rxlev access min 0
   periodic location update 30
@@ -210,7 +210,7 @@ network
    rf_locked 0
    arfcn <%= @arfcn_B %>
    nominal power 37
-   max_power_red 24
+   max_power_red <%= @max_power_red %>
    rsl e1 tei 0
    timeslot 0
     phys_chan_config CCCH