[CORD-1333] Removing ngXosLib
Change-Id: Iad67ac73b81b4ef20c2b3f1472552d756a27a7a6
(cherry picked from commit c111b4436a361473fb7a23cbe88586477a23d446)
diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index 2409717..7aa76dc 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -58,9 +58,6 @@
xos_users: []
-xos_libraries:
- - "ng-xos-lib"
-
# name of master ssh key for this pod
pod_sshkey_name: "headnode"
diff --git a/roles/cord-profile/files/fixtures.yaml b/roles/cord-profile/files/fixtures.yaml
index 5f14242..f1ff639 100644
--- a/roles/cord-profile/files/fixtures.yaml
+++ b/roles/cord-profile/files/fixtures.yaml
@@ -88,59 +88,6 @@
type: tosca.nodes.Flavor
# -----------------------------------------------------------------------------
-# Dashboard Views
-# -----------------------------------------------------------------------------
-
-# Temporary removed, waiting for a new Angular Base Implementation
-# xsh:
-# type: tosca.nodes.DashboardView
-# properties:
-# url: template:xsh
-
- Customize:
- type: tosca.nodes.DashboardView
- properties:
- url: template:xosDashboardManager
- custom_icon: true
-
- Diagnostic:
- type: tosca.nodes.DashboardView
- properties:
- url: template:xosDiagnostic
- custom_icon: true
-
- Truckroll:
- type: tosca.nodes.DashboardView
- properties:
- url: template:xosTruckroll
- custom_icon: true
-
- Monitoring:
- type: tosca.nodes.DashboardView
- properties:
- url: template:xosCeilometerDashboard
-
- Subscribers:
- type: tosca.nodes.DashboardView
- properties:
- url: template:xosSubscribers
-
- Tenant:
- type: tosca.nodes.DashboardView
- properties:
- url: template:xosTenant
-
- Developer:
- type: tosca.nodes.DashboardView
- properties:
- url: template:xosDeveloper
-
- Services Grid:
- type: tosca.nodes.DashboardView
- properties:
- url: template:xosServiceGrid
-
-# -----------------------------------------------------------------------------
# Network Templates
# -----------------------------------------------------------------------------
diff --git a/roles/cord-profile/templates/deployment.yaml.j2 b/roles/cord-profile/templates/deployment.yaml.j2
index 71f1355..c572e54 100644
--- a/roles/cord-profile/templates/deployment.yaml.j2
+++ b/roles/cord-profile/templates/deployment.yaml.j2
@@ -44,14 +44,3 @@
relationship: tosca.relationships.SupportsFlavor
{% endfor %}
-
-# Attach the Tenant view to the deployment
- Tenant:
- type: tosca.nodes.DashboardView
- properties:
- no-create: true
- no-delete: true
- requirements:
- - deployment:
- node: {{ deployment_type }}
- relationship: tosca.relationships.SupportsDeployment
diff --git a/roles/cord-profile/templates/docker-compose.yml.j2 b/roles/cord-profile/templates/docker-compose.yml.j2
index b3faeaf..a6e21b3 100644
--- a/roles/cord-profile/templates/docker-compose.yml.j2
+++ b/roles/cord-profile/templates/docker-compose.yml.j2
@@ -231,7 +231,7 @@
{% for network in xos_docker_networks %}
- {{ network }}
{% endfor %}
- command: python /opt/xos/manage.py runserver 0.0.0.0:9000 --insecure
+ command: python /opt/xos/manage.py runserver 0.0.0.0:9000
ports:
- "9000:9000"
links:
@@ -248,7 +248,6 @@
volumes:
- {{ head_cord_profile_dir }}/xos_config.yaml:/opt/xos/xos_config.yaml:ro
- {{ head_cord_profile_dir }}:/opt/cord_profile:ro
- - {{ head_cord_dir }}/orchestration/xos_libraries/ng-xos-lib:/opt/xos_libraries/ng-xos-lib:ro
- {{ head_cord_profile_dir }}/im_cert_chain.pem:/usr/local/share/ca-certificates/local_certs.crt:ro
logging:
driver: "json-file"
@@ -286,7 +285,6 @@
volumes:
- {{ head_cord_profile_dir }}/xos_config.yaml:/opt/xos/xos_config.yaml:ro
- {{ head_cord_profile_dir }}:/opt/cord_profile:ro
- - {{ head_cord_dir }}/orchestration/xos_libraries/ng-xos-lib:/opt/xos_libraries/ng-xos-lib:ro
- {{ head_cord_profile_dir }}/im_cert_chain.pem:/usr/local/share/ca-certificates/local_certs.crt:ro
- {{ head_cord_profile_dir }}/initial_data.yaml:/opt/xos/core/migrations/initial_data.yaml:ro
- /var/run/docker.sock:/var/run/docker.sock
diff --git a/roles/xos-core-build/defaults/main.yml b/roles/xos-core-build/defaults/main.yml
index 36a1093..d17e723 100644
--- a/roles/xos-core-build/defaults/main.yml
+++ b/roles/xos-core-build/defaults/main.yml
@@ -20,9 +20,6 @@
build_cord_dir: "{{ playbook_dir ~ '/../..' }}"
build_docker_tag: "candidate"
-xos_libraries:
- - "ng-xos-lib"
-
profile_library: ""
xos_services: []
diff --git a/roles/xos-core-build/tasks/main.yml b/roles/xos-core-build/tasks/main.yml
index 64b9956..71675b7 100644
--- a/roles/xos-core-build/tasks/main.yml
+++ b/roles/xos-core-build/tasks/main.yml
@@ -26,11 +26,6 @@
recipes: "{{ recipes }} + [ '/opt/cord/{{ item.path }}/xos/{{ item.name }}-{{ item.operation | default('onboard') }}.yaml']"
with_items: "{{ xos_services }}"
-- name: Generate list of libraries
- set_fact:
- recipes: "{{ recipes }} + [ '/opt/cord/orchestration/xos_libraries/{{ item }}/{{ item }}-onboard.yaml']"
- with_items: "{{ xos_libraries }}"
-
- name: Add in the profile library
set_fact:
recipes: "{{ recipes }} + [ '/opt/cord/orchestration/profiles/{{ profile_library }}/xos/{{ profile_library }}-onboard.yaml']"