[CORD-1569]
Clean up defaults files, removal of old gui config for documentation
Change-Id: I73a1c5bd0dedcfe09d817e4e5d59e1d5fca3c297
diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
index f497431..51e1cf7 100644
--- a/profile_manifests/ecord-global.yml
+++ b/profile_manifests/ecord-global.yml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
@@ -13,15 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# profile_manifests/ecord-global.yml
# E-CORD Profile Manifest
# Site configuration
site_name: mysite
site_humanname: MySite
-# site_suffix: "{{ site_name }}.cord.lab"
site_suffix: "cord.lab"
deployment_type: MyDeployment
@@ -44,12 +42,6 @@
gui_background: "cord-bg.jpg" # TODO find ecord image
gui_payoff: "Your Enterprise VNF orchestrator"
-# GUI branding
-gui_branding_name: "ECORD"
-gui_branding_icon: "/static/cord-logo.png"
-gui_branding_favicon: "/static/cord-favicon.png"
-gui_branding_bg: "/static/cord-bg.jpg"
-
enabled_gui_extensions:
- name: vnaasgui
path: orchestration/xos_services/vnaas/xos/gui
diff --git a/profile_manifests/ecord.yml b/profile_manifests/ecord.yml
index 4053e81..d793dfe 100644
--- a/profile_manifests/ecord.yml
+++ b/profile_manifests/ecord.yml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
@@ -13,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# profile_manifests/ecord.yaml
# E-CORD Profile Manifest
@@ -46,12 +45,6 @@
gui_background: "cord-bg.jpg" # TODO find ecord image
gui_payoff: "Your Enterprise VNF orchestrator"
-# GUI branding
-gui_branding_name: "ECORD"
-gui_branding_icon: "/static/cord-logo.png"
-gui_branding_favicon: "/static/cord-favicon.png"
-gui_branding_bg: "/static/cord-bg.jpg"
-
enabled_gui_extensions: []
# paths defined in manifest/default.xml
diff --git a/profile_manifests/mcord.yml b/profile_manifests/mcord.yml
index ff9c35c..f94799a 100644
--- a/profile_manifests/mcord.yml
+++ b/profile_manifests/mcord.yml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
@@ -13,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# profile_manifests/mcord.yml
# Configures an M-CORD pod
@@ -34,10 +33,6 @@
- fabric-service.yaml
- management-net.yaml
- xos-gui-extensions.yml
-# - mcord-services.yaml # should unify this with services.yaml.j2 eventually
-# - public-net.yaml
-# - volt-devices.yaml
-# - vrouter.yaml
xos_other_templates:
- fabric-network-cfg.json
@@ -46,18 +41,7 @@
gui_project_name: "M-CORD"
gui_background: "cord-bg.jpg" # TODO find mcord image
-# GUI branding [OLD GUI to be removed]
-gui_branding_name: "MCORD"
-gui_branding_icon: "/static/mcord-logo.png"
-gui_branding_favicon: "/static/mcord-favicon.png"
-gui_branding_bg: "/static/mcord-bg.jpg"
-
enabled_gui_extensions: []
-#enabled_gui_extensions:
-# - name: vtr
-# path: orchestration/xos_services/vtr/xos/gui
-# - name: rcord
-# path: orchestration/profiles/rcord/xos/gui
# paths defined in manifest/default.xml
xos_services:
@@ -75,23 +59,10 @@
- name: fabric
path: orchestration/xos_services/fabric
synchronizer: true
-# - name: vBBU
-# path: orchestration/xos_services/vBBU
-# keypair: mcord_rsa
-# synchronizer: true
- name: vmme
path: orchestration/xos_services/vmme
keypair: mcord_rsa
synchronizer: true
-# - name: vSGW
-# path: orchestration/xos_services/vSGW
-# keypair: mcord_rsa
-# synchronizer: true
-# - name: vPGWC
-# path: orchestration/xos_services/vPGWC
-# keypair: mcord_rsa
-# synchronizer: true
-# needed onboarding synchronizer doesn't require service code to be present when started
- name: exampleservice
path: orchestration/xos_services/exampleservice
keypair: exampleservice_rsa
@@ -101,8 +72,6 @@
keypair: monitoringservice_rsa
synchronizer: false
-# profile_library: "mcord"
-
# SSL server certificate generation
server_certs:
- cn: "keystone.{{ site_suffix }}"
diff --git a/profile_manifests/mock-ecord-global.yml b/profile_manifests/mock-ecord-global.yml
deleted file mode 100644
index be6d34b..0000000
--- a/profile_manifests/mock-ecord-global.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-# 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.
-
-
----
-# profile_manifests/mock-ecord.yml
-# creates a mock E-CORD pod
-
-site_name: mock-ecord
-deployment_type: "Mock E-CORD Global Pod"
-
-credentials_dir: "{{ playbook_dir }}/credentials"
-xos_admin_user: "xosadmin@opencord.org"
-xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
-xos_admin_first: XOS
-xos_admin_last: Admin
-
-frontend_only: False
-use_openstack: False
-use_vtn: False
-needs_pki_install: True
-
-build_xos_base_image: True
-
-xos_tosca_config_templates:
- - mock-onos.yaml
- - vnaasglobal-service.yaml
- - xos-gui-extensions.yml
-
-# GUI Config [new GUI]
-gui_project_name: "E-CORD"
-gui_background: "cord-bg.jpg" # TODO find ecord image
-gui_payoff: "Your Enterprise VNF orchestrator"
-
-# GUI branding
-gui_branding_name: "ECORD"
-gui_branding_icon: "/static/cord-logo.png"
-gui_branding_favicon: "/static/cord-favicon.png"
-gui_branding_bg: "/static/cord-bg.jpg"
-
-enabled_gui_extensions:
- - name: vnaasgui
- path: orchestration/xos_services/vnaas/xos/gui
- extra_files:
- - app/style/style.css
- - mapconstants.js
-
-# paths defined in manifest/default.xml
-xos_services:
- - name: onos
- path: orchestration/xos_services/onos-service
- - name: vnaas
- path: orchestration/xos_services/vnaas
-
-xos_service_sshkeys:
- - name: onos_rsa
- source_path: "/dev/null"
- - name: onos_rsa.pub
- source_path: "/dev/null"
-
-# site domain suffix
-site_suffix: opencord.org
-
-# SSL server certificate generation
-server_certs:
- - cn: "xos-core.{{ site_suffix }}"
- subj: "/C=US/ST=California/L=Menlo Park/O=ON.Lab/OU=Test Deployment/CN=xos-core.{{ site_suffix }}"
- altnames:
- - "DNS:xos-core.{{ site_suffix }}"
-
-xos_images: []
\ No newline at end of file
diff --git a/profile_manifests/mock-ecord.yml b/profile_manifests/mock-ecord.yml
deleted file mode 100644
index 7c10dc8..0000000
--- a/profile_manifests/mock-ecord.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-
-# 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.
-
-
----
-# profile_manifests/mock-ecord.yml
-# creates a mock E-CORD pod
-
-site_name: mock-ecord
-deployment_type: "Mock E-CORD Pod"
-
-credentials_dir: "{{ playbook_dir }}/credentials"
-xos_admin_user: "xosadmin@opencord.org"
-xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
-xos_admin_first: XOS
-xos_admin_last: Admin
-
-frontend_only: False
-use_openstack: False
-use_vtn: False
-needs_pki_install: True
-
-build_xos_base_image: True
-
-xos_tosca_config_templates:
- - management-net.yaml
- - mock-onos.yaml
-# - vtn-service.yaml # rimosso
-# - fabric-service.yaml # rimosso
- - ecord-services.yaml
- - vee-service.yaml
- - xos-gui-extensions.yml
-
-# GUI Config [new GUI]
-gui_project_name: "E-CORD"
-gui_background: "cord-bg.jpg" # TODO find ecord image
-gui_payoff: "Your Enterprise VNF orchestrator"
-
-# GUI branding
-gui_branding_name: "ECORD"
-gui_branding_icon: "/static/cord-logo.png"
-gui_branding_favicon: "/static/cord-favicon.png"
-gui_branding_bg: "/static/cord-bg.jpg"
-
-# paths defined in manifest/default.xml
-xos_services:
- - name: openstack
- path: orchestration/xos_services/openstack
- - name: onos
- path: orchestration/xos_services/onos-service
- - name: vtn
- path: orchestration/xos_services/vtn-service
- - name: fabric
- path: orchestration/xos_services/fabric
- - name: vrouter
- path: orchestration/xos_services/vrouter
- - name: veg
- path: orchestration/xos_services/vEG
- - name: vnodlocal
- path: orchestration/xos_services/metronet-local
- - name: vee
- path: orchestration/xos_services/vEE
-
-xos_service_sshkeys:
- - name: onos_rsa
- source_path: "/dev/null"
- - name: onos_rsa.pub
- source_path: "/dev/null"
- - name: veg_rsa
- source_path: "/dev/null"
- - name: veg_rsa.pub
- source_path: "/dev/null"
-
-# site domain suffix
-site_suffix: opencloud.us
-
-# SSL server certificate generation
-server_certs:
- - cn: "xos-core.{{ site_suffix }}"
- subj: "/C=US/ST=California/L=Menlo Park/O=ON.Lab/OU=Test Deployment/CN=xos-core.{{ site_suffix }}"
- altnames:
- - "DNS:xos-core.{{ site_suffix }}"
-
-xos_images: []
\ No newline at end of file
diff --git a/profile_manifests/mock-mcord.yml b/profile_manifests/mock-mcord.yml
deleted file mode 100644
index 42b21d5..0000000
--- a/profile_manifests/mock-mcord.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-# 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.
-
-
----
-# vars/mock-mcord.yaml
-# creates a mock MCORD pod
-
-site_name: mock-mcord
-deployment_type: "Mock M-CORD Pod"
-
-credentials_dir: "{{ playbook_dir }}/credentials"
-xos_admin_user: "xosadmin@opencord.org"
-xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
-xos_admin_first: XOS
-xos_admin_last: Admin
-
-frontend_only: True
-use_openstack: False
-use_vtn: False
-needs_pki_install: True
-
-build_xos_base_image: True
-
-xos_tosca_config_templates:
- - sample.yaml
- - management-net.yaml
- - mock-mcord.yaml
- - xos-gui-extensions.yml
-
-# GUI Config [new GUI]
-gui_project_name: "M-CORD"
-gui_payoff: "Your way toward 5G"
-gui_routes:
- - label: "Slices"
- state: "xos.core.slice"
- - label: "Nodes"
- state: "xos.core.node"
- - label: "Instances"
- state: "xos.core.instance"
- - label: "MCORD"
- state: "xos.mcord"
- - label: "Topology"
- state: "xos.mcord.topology"
- parent: "xos.mcord"
-
-# GUI branding
-gui_branding_name: "M-CORD"
-gui_branding_icon: "/static/cord-logo.png"
-gui_branding_favicon: "/static/cord-favicon.png"
-gui_branding_bg: "/static/mcord-bg.jpg"
-gui_service_view_class: "core.views.mCordServiceGrid.ServiceGridView"
-
-# site domain suffix
-site_suffix: opencloud.us
-
-# SSL server certificate generation
-server_certs:
- - cn: "xos-core.{{ site_suffix }}"
- subj: "/C=US/ST=California/L=Menlo Park/O=ON.Lab/OU=Test Deployment/CN=xos-core.{{ site_suffix }}"
- altnames:
- - "DNS:xos-core.{{ site_suffix }}"
-
-xos_images: []
\ No newline at end of file
diff --git a/profile_manifests/mock-rcord.yml b/profile_manifests/mock-rcord.yml
deleted file mode 100644
index a714b1a..0000000
--- a/profile_manifests/mock-rcord.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-# 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.
-
-
----
-# vars/frontend-rcord.yaml
-# creates a mock R-CORD pod
-
-site_name: mock-rcord
-deployment_type: "Mock R-CORD Pod"
-
-xos_admin_user: "xosadmin@opencord.org"
-xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
-xos_admin_first: XOS
-xos_admin_last: Admin
-
-credentials_dir: "{{ playbook_dir }}/credentials"
-
-frontend_only: True
-use_openstack: False
-use_vtn: True
-needs_pki_install: True
-
-build_xos_base_image: True
-
-xos_tosca_config_templates:
- - management-net.yaml
- - mock-onos.yaml
- - cord-services.yaml
- - public-net.yaml
- # - test-subscriber.yaml # broken? Missing lan_network config on vOLT ?
- - xos-gui-extensions.yml
-
-# GUI Config [new GUI]
-gw_port: 3000
-gui_api_endpoint: "/xosapi/v1"
-gui_websocket: "/"
-gui_project_name: "R-CORD"
-gui_favicon: "cord-favicon.png"
-gui_background: "cord-bg.jpg"
-gui_payoff: "Your VNF orchestrator"
-gui_logo: "cord-logo.png"
-gui_routes:
- - label: "Slices"
- state: "xos.core.slice"
- - label: "Nodes"
- state: "xos.core.node"
- - label: "Instances"
- state: "xos.core.instance"
-
-enabled_gui_extensions:
- - name: vtr
- path: orchestration/xos_services/vtr/xos/gui
- - name: rcord
- path: orchestration/profiles/rcord/xos/gui
-
-# GUI branding [OLD GUI to be removed]
-gui_branding_name: "CORD"
-gui_branding_icon: "/static/cord-logo.png"
-gui_branding_favicon: "/static/cord-favicon.png"
-gui_branding_bg: "/static/cord-bg.jpg"
-
-# paths defined in manifest/default.xml
-xos_services:
- - name: volt
- path: orchestration/xos_services/olt-service
- keypair: volt_rsa
- - name: onos
- path: orchestration/xos_services/onos-service
- keypair: onos_rsa
- - name: vrouter
- path: orchestration/xos_services/vrouter
- - name: addressmanager
- path: orchestration/xos_services/addressmanager
- - name: vsg
- path: orchestration/xos_services/vsg
- keypair: vsg_rsa
- - name: vtr
- path: orchestration/xos_services/vtr
- keypair: vsg_rsa
- - name: fabric
- path: orchestration/xos_services/fabric
-
-profile_library: "rcord"
-
-# site domain suffix
-site_suffix: opencord.org
-
-# SSL server certificate generation
-server_certs:
- - cn: "xos-core.{{ site_suffix }}"
- subj: "/C=US/ST=California/L=Menlo Park/O=ON.Lab/OU=Test Deployment/CN=xos-core.{{ site_suffix }}"
- altnames:
- - "DNS:xos-core.{{ site_suffix }}"
-
-xos_images: []
\ No newline at end of file
diff --git a/profile_manifests/rcord.yml b/profile_manifests/rcord.yml
index c68ef8a..eecae0a 100644
--- a/profile_manifests/rcord.yml
+++ b/profile_manifests/rcord.yml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
@@ -13,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# profile_manifests/rcord.yml
# R-CORD Profile Manifest
@@ -42,12 +41,6 @@
xos_other_templates:
- fabric-network-cfg.json
-# GUI branding [OLD GUI to be removed]
-gui_branding_name: "CORD"
-gui_branding_icon: "/static/cord-logo.png"
-gui_branding_favicon: "/static/cord-favicon.png"
-gui_branding_bg: "/static/cord-bg.jpg"
-
enabled_gui_extensions:
- name: vtr
path: orchestration/xos_services/vtr/xos/gui