Minor fixes to help integration of CORD-912
Change-Id: I8dd69bf2eae091ca60bbbfbfebce465405662a58
diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index 542ac64..d867ef6 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -12,12 +12,6 @@
head_cord_profile_dir: "/opt/cord_profile"
head_cord_dir: "/opt/cord"
-deploy_docker_registry: "" # was: "localhost:5000/"
-deploy_docker_tag: "candidate"
-
-# name of docker image to use in onboarding synchronizer
-xos_docker_image: "{{ deploy_docker_registry }}xosproject/xos{{ deploy_docker_tag }}"
-
# For storing OpenStack images
image_dir: /opt/images
@@ -35,11 +29,13 @@
use_vtn: True
+# Docker related settings
+deploy_docker_registry: ""
+deploy_docker_tag: "candidate"
+
xos_docker_networks:
- "xos"
-xos_docker_volumes: []
-
xos_bootstrap_ui_port: 9001
xos_ui_port: 9000
diff --git a/roles/cord-profile/files/fixtures.yaml b/roles/cord-profile/files/fixtures.yaml
index 00da082..02e0f6f 100644
--- a/roles/cord-profile/files/fixtures.yaml
+++ b/roles/cord-profile/files/fixtures.yaml
@@ -90,45 +90,45 @@
Customize:
type: tosca.nodes.DashboardView
properties:
- url: template:xosDashboardManager
- custom_icon: true
+ url: template:xosDashboardManager
+ custom_icon: true
Diagnostic:
type: tosca.nodes.DashboardView
properties:
- url: template:xosDiagnostic
- custom_icon: true
+ url: template:xosDiagnostic
+ custom_icon: true
Truckroll:
type: tosca.nodes.DashboardView
properties:
- url: template:xosTruckroll
- custom_icon: true
+ url: template:xosTruckroll
+ custom_icon: true
Monitoring:
type: tosca.nodes.DashboardView
properties:
- url: template:xosCeilometerDashboard
+ url: template:xosCeilometerDashboard
Subscribers:
type: tosca.nodes.DashboardView
properties:
- url: template:xosSubscribers
+ url: template:xosSubscribers
Tenant:
type: tosca.nodes.DashboardView
properties:
- url: template:xosTenant
+ url: template:xosTenant
Developer:
type: tosca.nodes.DashboardView
properties:
- url: template:xosDeveloper
+ url: template:xosDeveloper
Services Grid:
type: tosca.nodes.DashboardView
properties:
- url: template:xosServiceGrid
+ url: template:xosServiceGrid
# -----------------------------------------------------------------------------
# Network Templates
@@ -137,20 +137,20 @@
Private:
type: tosca.nodes.NetworkTemplate
properties:
- visibility: private
- translation: none
+ visibility: private
+ translation: none
Public shared IPv4:
type: tosca.nodes.NetworkTemplate
properties:
- visibility: private
- translation: NAT
- shared_network_name: nat-net
+ visibility: private
+ translation: NAT
+ shared_network_name: nat-net
Public dedicated IPv4:
type: tosca.nodes.NetworkTemplate
properties:
- visibility: public
- translation: none
- shared_network_name: ext-net
+ visibility: public
+ translation: none
+ shared_network_name: ext-net
diff --git a/roles/cord-profile/templates/deployment.yaml.j2 b/roles/cord-profile/templates/deployment.yaml.j2
index 0987b7c..d1c4626 100644
--- a/roles/cord-profile/templates/deployment.yaml.j2
+++ b/roles/cord-profile/templates/deployment.yaml.j2
@@ -21,9 +21,9 @@
type: tosca.nodes.Deployment
requirements:
{% for flavor in deployment_flavors %}
- - {{ flavor }}:
- node: {{ flavor }}
- relationship: tosca.relationships.SupportsFlavor
+ - {{ flavor }}:
+ node: {{ flavor }}
+ relationship: tosca.relationships.SupportsFlavor
{% endfor %}
@@ -31,9 +31,9 @@
{{ site_name }}:
type: tosca.nodes.Site
properties:
- display_name: {{ site_humanname }}
- site_url: http://{{ site_name }}.opencloud.us/
- hosts_nodes: true
+ display_name: {{ site_humanname }}
+ site_url: http://{{ site_name }}.opencloud.us/
+ hosts_nodes: true
requirements:
- deployment:
node: {{ deployment_type }}
@@ -43,12 +43,12 @@
Tenant:
type: tosca.nodes.DashboardView
properties:
- no-create: true
- no-delete: true
+ no-create: true
+ no-delete: true
requirements:
- - deployment:
- node: {{ deployment_type }}
- relationship: tosca.relationships.SupportsDeployment
+ - deployment:
+ node: {{ deployment_type }}
+ relationship: tosca.relationships.SupportsDeployment
# XOS Users
# Default admin user account
@@ -64,8 +64,8 @@
node: {{ site_name }}
relationship: tosca.relationships.MemberOfSite
- tenant_dashboard:
- node: Tenant
- relationship: tosca.relationships.UsesDashboard
+ node: Tenant
+ relationship: tosca.relationships.UsesDashboard
# All other users
{% for user in xos_users %}
@@ -81,8 +81,8 @@
node: {{ site_name }}
relationship: tosca.relationships.MemberOfSite
- tenant_dashboard:
- node: Tenant
- relationship: tosca.relationships.UsesDashboard
+ node: Tenant
+ relationship: tosca.relationships.UsesDashboard
{% endfor %}
diff --git a/roles/cord-profile/templates/xos_common_config.j2 b/roles/cord-profile/templates/xos_common_config.j2
index ba67acd..af7b2a0 100644
--- a/roles/cord-profile/templates/xos_common_config.j2
+++ b/roles/cord-profile/templates/xos_common_config.j2
@@ -1,5 +1,5 @@
; xos_common_config
-; generated by platform-install/roles/cord-profile
+; generated by cord-profile/templates/xos_common_config.j2
[plc]
name=plc
diff --git a/roles/docker-install/handlers/main.yml b/roles/docker-install/handlers/main.yml
deleted file mode 100644
index 697fec7..0000000
--- a/roles/docker-install/handlers/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# docker-install/handlers/main.yml
-
-- name: docker-restart
- become: yes
- service:
- name: docker
- state: restarted
-
diff --git a/roles/docker-install/tasks/main.yml b/roles/docker-install/tasks/main.yml
index 826d5bb..2beb5c7 100644
--- a/roles/docker-install/tasks/main.yml
+++ b/roles/docker-install/tasks/main.yml
@@ -5,9 +5,9 @@
- name: Prereqs and SSL support for apt for SSL
become: yes
apt:
- name={{ item }}
- update_cache=yes
- cache_valid_time=3600
+ name: "{{ item }}"
+ update_cache: yes
+ cache_valid_time: 3600
with_items:
- apt-transport-https
- ca-certificates
@@ -26,9 +26,9 @@
- name: Install docker
become: yes
apt:
- update_cache=yes
- cache_valid_time=3600
- name=docker-engine
+ name: docker-engine
+ update_cache: yes
+ cache_valid_time: 3600
# docker fails without docker-py, docker-compose >1.9 fails with docker-py installed
- name: Install docker-compose and docker-py
diff --git a/roles/juju-compute-setup/tasks/main.yml b/roles/juju-compute-setup/tasks/main.yml
index d6a92c8..fdb5ef3 100644
--- a/roles/juju-compute-setup/tasks/main.yml
+++ b/roles/juju-compute-setup/tasks/main.yml
@@ -58,7 +58,7 @@
delay: 30
with_items: "{{ groups['compute'] }}"
-- name: verify that the nodes appear in nova
+- name: Verify that the nodes appear in nova
action: shell bash -c "source /opt/cord_profile/admin-openrc.sh; nova hypervisor-list | grep '{{ item }}'"
register: result
until: result | success
diff --git a/roles/onos-cord-install/defaults/main.yml b/roles/onos-cord-install/defaults/main.yml
index bdf6d18..b6f25f0 100644
--- a/roles/onos-cord-install/defaults/main.yml
+++ b/roles/onos-cord-install/defaults/main.yml
@@ -6,8 +6,10 @@
ssh_pki_dir: "{{ playbook_dir }}/ssh_pki"
head_onos_cord_dir: "/opt/onos_cord"
-# Should probably be set to a specific version
-onos_docker_image: "opencord/onos:latest"
+# ONOS docker image to use
+deploy_docker_registry: ""
+deploy_docker_tag: "candidate"
+onos_docker_image: "{{ deploy_docker_registry }}onosproject/onos:{{ deploy_docker_tag }}"
# log level for ONOS
onos_log_level: "INFO"
diff --git a/roles/onos-fabric-install/defaults/main.yml b/roles/onos-fabric-install/defaults/main.yml
index 2c70fc8..aaa91e9 100644
--- a/roles/onos-fabric-install/defaults/main.yml
+++ b/roles/onos-fabric-install/defaults/main.yml
@@ -4,7 +4,8 @@
# paths
head_onos_fabric_dir: "/opt/onos_fabric"
-# Should probably be set to a specific version
-onos_docker_image: "opencord/onos:latest"
-
+# ONOS docker image to use
+deploy_docker_registry: ""
+deploy_docker_tag: "candidate"
+onos_docker_image: "{{ deploy_docker_registry }}onosproject/onos:{{ deploy_docker_tag }}"
diff --git a/roles/prereqs-common/defaults/main.yml b/roles/prereqs-common/defaults/main.yml
index 1425db4..6c66757 100644
--- a/roles/prereqs-common/defaults/main.yml
+++ b/roles/prereqs-common/defaults/main.yml
@@ -17,7 +17,7 @@
- 199.7.91.13
http_dl_url: "http://cord.staging.wpengine.com/wp-content/uploads/2016/07/cord-tm-logo.png"
-http_dl_cksum: "sha256:9a69c741a4bb609ad7e49bd0fd335a95db2e66dc0d72866569e11385df9dcc28"
+http_dl_cksum: "sha256:099c777e4c8ad76a066299159622b4fa6bd2515cefafc2851df67f7f4cce6ee8"
https_dl_url: "https://jenkins.opencord.org/static/8d0f081d/images/headshot.png"
https_dl_cksum: "sha256:690e82fb98ffb2b4b232d9b9cf9cc52eb7972e56a84902f6d1150b75456058c6"
diff --git a/roles/prereqs-common/tasks/main.yml b/roles/prereqs-common/tasks/main.yml
index 642a1b4..f9ac2cd 100644
--- a/roles/prereqs-common/tasks/main.yml
+++ b/roles/prereqs-common/tasks/main.yml
@@ -43,10 +43,14 @@
url: "{{ http_dl_url }}"
checksum: "{{ http_dl_cksum }}"
dest: /tmp/http_dl_check
+ retries: 3
+ delay: 1
- name: HTTPS Download Check
get_url:
url: "{{ https_dl_url }}"
checksum: "{{ https_dl_cksum }}"
dest: /tmp/https_dl_check
+ retries: 3
+ delay: 1
diff --git a/roles/pull-xos-docker-images/defaults/main.yml b/roles/pull-xos-docker-images/defaults/main.yml
index bf12830..a5ba971 100644
--- a/roles/pull-xos-docker-images/defaults/main.yml
+++ b/roles/pull-xos-docker-images/defaults/main.yml
@@ -1 +1,4 @@
-deploy_docker_tag: candidate
\ No newline at end of file
+---
+# pull-xos-docker-images/defaults/main.yml
+
+deploy_docker_tag: "candidate"
diff --git a/roles/pull-xos-docker-images/tasks/main.yml b/roles/pull-xos-docker-images/tasks/main.yml
index ad394cd..96a94e6 100644
--- a/roles/pull-xos-docker-images/tasks/main.yml
+++ b/roles/pull-xos-docker-images/tasks/main.yml
@@ -4,7 +4,7 @@
- name: Pull latest versions of images if not present
docker_image:
name: "{{ item }}:latest"
- repository: "{{ item }}:candidate"
+ repository: "{{ item }}:{{ deploy_docker_tag }}"
with_items:
- xosproject/vsg
- redis
diff --git a/roles/teardown-openstack/tasks/main.yml b/roles/teardown-openstack/tasks/main.yml
index 857beb9..36f227b 100644
--- a/roles/teardown-openstack/tasks/main.yml
+++ b/roles/teardown-openstack/tasks/main.yml
@@ -1,3 +1,6 @@
+---
+# teardown-openstack/tasks/main.yml
+
- name: Remove Juju directory
file:
path: "{{ ansible_user_dir }}/.juju"
@@ -10,11 +13,3 @@
state: absent
with_items: "{{ head_lxd_list }}"
-- name: Remove PKI directories
- become: yes
- file:
- path: "{{ item }}"
- state: absent
- with_items:
- - /opt/cord/build/platform-install/pki/intermediate_ca
- - /opt/cord/build/platform-install/pki/root_ca
diff --git a/roles/xos-core-build/defaults/main.yml b/roles/xos-core-build/defaults/main.yml
index 2772a14..1114d07 100644
--- a/roles/xos-core-build/defaults/main.yml
+++ b/roles/xos-core-build/defaults/main.yml
@@ -4,7 +4,7 @@
build_cord_dir: "{{ playbook_dir ~ '/../..' }}"
build_docker_tag: "candidate"
-deploy_docker_registry: "localhost:5000"
+deploy_docker_registry: ""
deploy_docker_tag: "candidate"
xos_libraries:
diff --git a/roles/xos-core-publish/defaults/main.yml b/roles/xos-core-publish/defaults/main.yml
index cfc4100..91b3a50 100644
--- a/roles/xos-core-publish/defaults/main.yml
+++ b/roles/xos-core-publish/defaults/main.yml
@@ -1,6 +1,7 @@
---
+# xos-core-publish/defaults/main.yml
-build_docker_tag: candidate
+build_docker_tag: "candidate"
-deploy_docker_registry: "localhost:5000"
+deploy_docker_registry: ""
deploy_docker_tag: "candidate"
diff --git a/roles/xos-core-publish/tasks/main.yml b/roles/xos-core-publish/tasks/main.yml
index 2f80638..4d6efe4 100644
--- a/roles/xos-core-publish/tasks/main.yml
+++ b/roles/xos-core-publish/tasks/main.yml
@@ -1,5 +1,5 @@
---
-# xos-core-deploy/tasks/main.yml
+# xos-core-publish/tasks/main.yml
- name: Remove old local UI image
docker_image:
diff --git a/roles/xos-gui-extension-build/defaults/main.yml b/roles/xos-gui-extension-build/defaults/main.yml
deleted file mode 100644
index 0dd8561..0000000
--- a/roles/xos-gui-extension-build/defaults/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# xos-gui-extension-build/defaults/main.yml
-
-head_cord_dir: "/opt/cord"
-head_cord_profile_dir: "/opt/cord_profile"
-
-enabled_gui_extensions: []
diff --git a/roles/xos-gui-extension-build/tasks/main.yml b/roles/xos-gui-extension-build/tasks/main.yml
deleted file mode 100644
index b337d4f..0000000
--- a/roles/xos-gui-extension-build/tasks/main.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# xos-gui-extension-build/tasks/main.yml
-# Dockerfile.xos-gui-extension-builder
-
-# Create a base image with installed deps (to speedup the process)
-- name: Build xos-gui-extension-builder image
- docker_image:
- name: "xosproject/xos-gui-extension-builder"
- path: "{{ head_cord_dir }}/orchestration/xos-gui/"
- dockerfile: "Dockerfile.xos-gui-extension-builder"
- register: "xos-gui-extension-builder"
-
-# Build extensions images
-- name: Build xos-gui-extensions docker images
- docker_image:
- name: "xosproject/gui-extension-{{ item.name }}"
- path: "{{ head_cord_dir }}/{{ item.path }}"
- pull: false
- with_items: "{{ enabled_gui_extensions }}"
-
-# Compile the TOSCA to onboard and persist extensions
-- name: Create templated TOSCA to onboard extensions
- template:
- src: "{{ item }}.j2"
- dest: "{{ head_cord_profile_dir }}/{{ item }}"
- mode: 0644
- with_items:
- - xos-gui-extensions-onboard.yml
- - xos-gui-extensions.yml
-
diff --git a/roles/xos-gui-extension-build/templates/xos-gui-extensions-onboard.yml.j2 b/roles/xos-gui-extension-build/templates/xos-gui-extensions-onboard.yml.j2
deleted file mode 100644
index 435daa3..0000000
--- a/roles/xos-gui-extension-build/templates/xos-gui-extensions-onboard.yml.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Onboard xos-sample-gui-extension
-
-imports:
- - custom_types/xos.yaml
-
-topology_template:
- node_templates:
-
- # UI Extensions
-{% for ext in enabled_gui_extensions %}
- gui-extensions-{{ext.name}}:
- type: tosca.nodes.Component
- properties:
- image: xosproject/gui-extension-{{ ext.name }}
- command: npm run build
-
- gui-extensions-store-{{ ext.name }}:
- type: tosca.nodes.ComponentVolumeContainer
- properties:
- container: gui-extensions-store
- requirements:
- - xos:
- node: gui-extensions-{{ext.name}}
- relationship: tosca.relationships.VolumeContainerOfComponent
-{% endfor %}
-
diff --git a/roles/xos-gui-extension-build/templates/xos-gui-extensions.yml.j2 b/roles/xos-gui-extension-build/templates/xos-gui-extensions.yml.j2
deleted file mode 100644
index 6b5be5e..0000000
--- a/roles/xos-gui-extension-build/templates/xos-gui-extensions.yml.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Persist xos-sample-gui-extension
-
-imports:
- - custom_types/xos.yaml
-
-topology_template:
- node_templates:
-
- # UI Extension
-{% for ext in enabled_gui_extensions %}
- {{ext.name}}:
- type: tosca.nodes.XOSGuiExtension
- properties:
- files: /spa/extensions/{{ext.name}}/vendor.js, /spa/extensions/{{ext.name}}/app.js
-{% endfor %}
diff --git a/roles/xos-gui-extension-onboard/defaults/main.yml b/roles/xos-gui-extension-onboard/defaults/main.yml
deleted file mode 100644
index 450ea3d..0000000
--- a/roles/xos-gui-extension-onboard/defaults/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# xos-gui-extension-onboard/defaults/main.yml
-
-xos_admin_user: "xosadmin@opencord.org"
-
diff --git a/roles/xos-gui-extension-onboard/tasks/main.yaml b/roles/xos-gui-extension-onboard/tasks/main.yaml
deleted file mode 100644
index 5ea8897..0000000
--- a/roles/xos-gui-extension-onboard/tasks/main.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# xos-gui-extension-onboard/tasks/main.yml
-
-- name: Execute xos-gui-extensions onboard TOSCA recipe
- command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} /opt/cord_profile/xos-gui-extensions-onboard.yml"
- tags:
- - skip_ansible_lint # TOSCA loading should be idempotent
-
-- name: Execute xos-gui-extensions persist TOSCA recipe
- command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} /opt/cord_profile/xos-gui-extensions.yml"
- tags:
- - skip_ansible_lint # TOSCA loading should be idempotent
-