CORD-2285 Add M-CORD license file
Change-Id: I9ae31e059bfdc35b4fe22cb649b5cf5a9174a1e3
(cherry picked from commit 4809f7c6ed2ec1f2a99abb1f15bc52f44e05c001)
diff --git a/xos/models/venb.xproto b/xos/models/venb.xproto
index f40ce7e..b74784e 100644
--- a/xos/models/venb.xproto
+++ b/xos/models/venb.xproto
@@ -3,7 +3,7 @@
message VENBService (Service){
option verbose_name = "Virtual eNodeB Service";
- required string login_user = 1 [help_text = "vENB VM login user", default = "cfguser", max_length = 32, content_type = "stripped", null = False, db_index = False, blank = False];
+ required string login_user = 1 [help_text = "vENB VM login user", default = "ubuntu", max_length = 32, content_type = "stripped", null = False, db_index = False, blank = False];
required string login_password = 2 [help_text = "vENB VM login password", default = "cfguser", max_length = 32, content_type = "stripped", null = False, db_index = False, blank = False];
required string tas_ip = 3 [help_text = "TAS IP address", default = "103.0.0.100", max_length = 32, null = False, db_index = False, blank = False];
required string ntp_ip = 4 [help_text = "NTP server IP address", default = "193.0.0.222", max_length = 32, null = False, db_index = False, blank = False];
diff --git a/xos/synchronizer/files/ng4t-license.txt b/xos/synchronizer/files/ng4t-license.txt
new file mode 100644
index 0000000..6c6dce8
--- /dev/null
+++ b/xos/synchronizer/files/ng4t-license.txt
@@ -0,0 +1,3 @@
+*** REPLACE WITH LICENSE FILE ***
+
+Put a link here to instructions on how to download the license.
diff --git a/xos/synchronizer/steps/roles/ng4t_config/defaults/main.yml b/xos/synchronizer/steps/roles/ng4t_config/defaults/main.yml
new file mode 100644
index 0000000..2b9f42e
--- /dev/null
+++ b/xos/synchronizer/steps/roles/ng4t_config/defaults/main.yml
@@ -0,0 +1,17 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# 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
+#
+# http://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.
+
+---
+ng4t_license_src: /opt/xos/synchronizers/venb/files/ng4t-license.txt
+ng4t_license_dest: /tmp/license.txt
\ No newline at end of file
diff --git a/xos/synchronizer/steps/roles/ng4t_config/tasks/main.yml b/xos/synchronizer/steps/roles/ng4t_config/tasks/main.yml
new file mode 100644
index 0000000..42e1049
--- /dev/null
+++ b/xos/synchronizer/steps/roles/ng4t_config/tasks/main.yml
@@ -0,0 +1,21 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# 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
+#
+# http://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.
+
+---
+- name: Copy license file
+ copy:
+ src: "{{ ng4t_license_src }}"
+ dest: "{{ ng4t_license_dest }}"
+ owner: root
+ mode: 0644
diff --git a/xos/synchronizer/steps/venbserviceinstance_playbook.yaml b/xos/synchronizer/steps/venbserviceinstance_playbook.yaml
index 1cbd67f..4da768e 100644
--- a/xos/synchronizer/steps/venbserviceinstance_playbook.yaml
+++ b/xos/synchronizer/steps/venbserviceinstance_playbook.yaml
@@ -17,6 +17,7 @@
gather_facts: False
connection: ssh
user: {{ login_user }}
+ # These are still the old variables; update for ng4T emulator
vars:
- ts_ip: {{ flat_ip }}
- ts_mask: "255.255.255.0"
@@ -26,5 +27,5 @@
- ntp_ip: "{{ ntp_ip }}"
- password: "{{ login_password }}"
roles:
- - ts_config
+ - ng4t_config