From 9b75143309500ccf82c70d818615b41e7e54c065 Mon Sep 17 00:00:00 2001 From: Matt Johnson Date: Tue, 9 Jul 2019 17:14:05 -0500 Subject: [PATCH 1/4] hiera: Specify a value for the ntp_servers hiera key The ntp_servers key is referred to in `modules/rhizo_base/manifests/init.pp` and was otherwise undefined. It is in the common file since it seems similar to other parameters already in the file, but there is no strict reason for the current location. The assigned value is also just an initial default guess. --- hieradata/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 88d4514..8dc8512 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -56,7 +56,7 @@ rhizo::use_ups: "no" rhizo::use_sip: "no" rhizo::advice_email: "[ 'your@email.address' ]" rhizo::sip_central_ip_address: "127.0.0.1" - +rhizo::ntp_servers: ['mx.pool.ntp.org', 'pool.ntp.org'] #SSH keys sshkeys::keys: From 56084109537d47e5ff51f140a02bb2829a5751af Mon Sep 17 00:00:00 2001 From: Matt Johnson Date: Tue, 9 Jul 2019 17:54:23 -0500 Subject: [PATCH 2/4] hiera: Add value for missing key rhizo::ggsn_ip_address By default assume the ggsn is running on localhost. The ggsn_ip_address key is accessed in `modules/rhizo_base/manifests/openbsc.pp`. --- hieradata/site_template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hieradata/site_template.yaml b/hieradata/site_template.yaml index 9c7437b..ccdb404 100644 --- a/hieradata/site_template.yaml +++ b/hieradata/site_template.yaml @@ -11,6 +11,7 @@ rhizo::arfcn_B: "251" rhizo::auth_policy: "accept-all" rhizo::vpn_ip_address: "10.66.0.0" rhizo::wan_ip_address: "192.168.0.0" +rhizo::ggsn_ip_address: "127.0.0.1" rhizo::lac: "1" rhizo::mcc: "001" rhizo::mnc: "001" From 1e82cd62aa26aead3285bb4b3ffd3a7a6e185b1b Mon Sep 17 00:00:00 2001 From: Matt Johnson Date: Tue, 9 Jul 2019 17:57:54 -0500 Subject: [PATCH 3/4] hiera: Add missing rhizo::gprs key rhizo::grps is referred to in `modules/rhizo_base/manifests/init.pp`. The default value of "none" is only a guess but allows puppet provisioning to complete and the osmocom stack to start. --- hieradata/site_template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hieradata/site_template.yaml b/hieradata/site_template.yaml index ccdb404..f8cd60d 100644 --- a/hieradata/site_template.yaml +++ b/hieradata/site_template.yaml @@ -15,6 +15,7 @@ rhizo::ggsn_ip_address: "127.0.0.1" rhizo::lac: "1" rhizo::mcc: "001" rhizo::mnc: "001" +rhizo::gprs: "none" #Emergency call contact rhizo::emergency_contact: "12345" From e2b93afc67bde8d0cf447adae97b1c1b148945c1 Mon Sep 17 00:00:00 2001 From: Matt Johnson Date: Tue, 9 Jul 2019 18:00:51 -0500 Subject: [PATCH 4/4] hiera: Add missing key rhizo::local_bsc_cfg The key referred to in `modules/rhizo_base/manifests/openbsc.pp`. A default value of 0 (anything but "1") will result in a new config being generated from a template. --- hieradata/site_template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/hieradata/site_template.yaml b/hieradata/site_template.yaml index f8cd60d..59e885f 100644 --- a/hieradata/site_template.yaml +++ b/hieradata/site_template.yaml @@ -16,6 +16,7 @@ rhizo::lac: "1" rhizo::mcc: "001" rhizo::mnc: "001" rhizo::gprs: "none" +rhizo::local_bsc_cfg: "0" #Emergency call contact rhizo::emergency_contact: "12345"