[CORD-1569]
Clean up defaults files, removal of old gui config for documentation
Change-Id: I73a1c5bd0dedcfe09d817e4e5d59e1d5fca3c297
diff --git a/roles/compute-node-enable-maas/defaults/main.yml b/roles/compute-node-enable-maas/defaults/main.yml
index 5335970..62cedcb 100644
--- a/roles/compute-node-enable-maas/defaults/main.yml
+++ b/roles/compute-node-enable-maas/defaults/main.yml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
@@ -13,14 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# compute-node-enable-maas/defaults/main.yml
-credentials_dir: "/opt/credentials"
head_cord_profile_dir: "/opt/cord_profile"
xos_admin_user: "xosadmin@opencord.org"
-xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
+maas_xos_admin_pass: "{{ lookup('file', '/opt/credentials/xosadmin@opencord.org') }}"
xos_ui_port: 9000
diff --git a/roles/compute-node-enable-maas/tasks/main.yml b/roles/compute-node-enable-maas/tasks/main.yml
index 135d882..5a00ad8 100644
--- a/roles/compute-node-enable-maas/tasks/main.yml
+++ b/roles/compute-node-enable-maas/tasks/main.yml
@@ -33,7 +33,7 @@
xostosca:
url: "http://xos.{{ site_suffix }}:{{ xos_ui_port }}/api/utility/tosca/run/"
user: "{{ xos_admin_user }}"
- password: "{{ xos_admin_pass }}"
+ password: "{{ maas_xos_admin_pass }}"
recipe: "{{ lookup('file', '/tmp/' + item ) }}"
with_items:
- openstack.yaml
@@ -47,7 +47,7 @@
xostosca:
url: "http://xos.{{ site_suffix }}:{{ xos_ui_port }}/api/utility/tosca/run/"
user: "{{ xos_admin_user }}"
- password: "{{ xos_admin_pass }}"
+ password: "{{ maas_xos_admin_pass }}"
recipe: "{{ lookup('file', '/tmp/' + item ) }}"
with_items:
- vtn-service.yaml
diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index be070cc..f94e86a 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -93,14 +93,6 @@
- label: "Instances"
state: "xos.core.instance"
-# GUI branding, used in xos_common_config.j2
-disable_minidashboard: "True"
-gui_branding_name: "OpenCloud"
-gui_branding_icon: "/static/logo.png"
-gui_branding_favicon: "/static/favicon.png"
-gui_branding_bg: "/static/bg.jpg"
-gui_service_view_class: False
-
# used in admin-openrc.sh.j2
keystone_admin_password: "{{ lookup('password', credentials_dir ~ '/cord_keystone_admin chars=ascii_letters,digits') }}"
diff --git a/roles/juju-setup/defaults/main.yml b/roles/juju-setup/defaults/main.yml
index 882473d..0802ced 100644
--- a/roles/juju-setup/defaults/main.yml
+++ b/roles/juju-setup/defaults/main.yml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
@@ -13,10 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# juju-setup/defaults/main.yml
-
+#
# note: juju_config_path and charm_versions are also set in
# `juju-compute-setup/defaults/main.yml`. Keep these in sync.
@@ -31,7 +30,7 @@
keystone_admin_password: "{{ lookup('password', credentials_dir ~ '/cord_keystone_admin chars=ascii_letters,digits') }}"
-enable_dpdk: False
+use_dpdk: False
vcpu_pin_set: "^0,^2"
hugepages: "60%"
dpdk_socket_memory: "1024,0"
diff --git a/roles/juju-setup/templates/juju_config.yml.j2 b/roles/juju-setup/templates/juju_config.yml.j2
index cd6b929..f3db2ae 100644
--- a/roles/juju-setup/templates/juju_config.yml.j2
+++ b/roles/juju-setup/templates/juju_config.yml.j2
@@ -1,4 +1,4 @@
-
+---
{#
Copyright 2017-present Open Networking Foundation
@@ -15,8 +15,6 @@
limitations under the License.
#}
-
----
# juju configuration file for CORD deployments
ceilometer:
@@ -49,7 +47,7 @@
onos-vtn-port: 8182
neutron-security-groups: "True"
overlay-network-type: vxlan
- {% if enable_dpdk -%}
+ {% if use_dpdk -%}
onos-vtn-branch: cord-2.0-dpdk-kilo
{% endif %}
@@ -60,7 +58,7 @@
config-flags: "force_config_drive=always"
console-access-protocol: novnc
network-manager: Neutron
- {% if enable_dpdk -%}
+ {% if use_dpdk -%}
scheduler-default-filters: "RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,NUMATopologyFilter"
{% endif %}
@@ -68,7 +66,7 @@
openstack-origin: "cloud:trusty-kilo"
virt-type: kvm
disable-neutron-security-groups: "True"
- {% if enable_dpdk -%}
+ {% if use_dpdk -%}
config-flags: "firewall_driver=nova.virt.firewall.NoopFirewallDriver,vcpu_pin_set={{ vcpu_pin_set }}"
enable-dpdk: True
hugepages: "{{ hugepages }}"
diff --git a/roles/onos-fabric-install/defaults/main.yml b/roles/onos-fabric-install/defaults/main.yml
index 775ab97..2551ed6 100644
--- a/roles/onos-fabric-install/defaults/main.yml
+++ b/roles/onos-fabric-install/defaults/main.yml
@@ -18,7 +18,7 @@
# onos-fabric-install/defaults/main.yml
# paths
-head_onos_fabric_dir: "/opt/onos_fabric/"
+head_onos_fabric_dir: "/opt/onos_fabric"
# ONOS docker image to use
pull_docker_registry: ""
diff --git a/roles/onos-fabric-install/tasks/main.yml b/roles/onos-fabric-install/tasks/main.yml
index f664550..b6bd712 100644
--- a/roles/onos-fabric-install/tasks/main.yml
+++ b/roles/onos-fabric-install/tasks/main.yml
@@ -41,5 +41,6 @@
- name: Start ONOS for fabric
docker_service:
+ project_name: "onosfabric"
project_src: "{{ head_onos_fabric_dir }}"
diff --git a/roles/teardown-onos/defaults/main.yml b/roles/teardown-onos/defaults/main.yml
new file mode 100644
index 0000000..abab6d0
--- /dev/null
+++ b/roles/teardown-onos/defaults/main.yml
@@ -0,0 +1,20 @@
+---
+# 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.
+
+# teardown-onos/defaults/main.yml
+
+head_onos_cord_dir: "/opt/onos_cord"
+head_onos_fabric_dir: "/opt/onos_fabric"
+
diff --git a/roles/teardown-onos/tasks/main.yml b/roles/teardown-onos/tasks/main.yml
new file mode 100644
index 0000000..5d12823
--- /dev/null
+++ b/roles/teardown-onos/tasks/main.yml
@@ -0,0 +1,37 @@
+---
+# 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.
+
+# teardown-onos/tasks/main.yml
+#
+# Destroys the ONOS containers
+# NOTE: ignoring errors so that incomplete builds can be removed
+
+- name: Stop and remove onos-cord containers
+ docker_service:
+ project_name: "onoscord"
+ project_src: "{{ head_onos_cord_dir }}"
+ state: absent
+ remove_images: local
+ ignore_errors: yes
+
+- name: Stop and remove onos-fabric containers
+ when: use_fabric
+ docker_service:
+ project_name: "onosfabric"
+ project_src: "{{ head_onos_fabric_dir }}"
+ state: absent
+ remove_images: local
+ ignore_errors: yes
+
diff --git a/roles/test-exampleservice/defaults/main.yml b/roles/test-exampleservice/defaults/main.yml
index 8550ade..c6c615f 100644
--- a/roles/test-exampleservice/defaults/main.yml
+++ b/roles/test-exampleservice/defaults/main.yml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,15 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# test-exampleservice/defaults/main.yml
head_cord_profile_dir: "/opt/cord_profile"
-credentials_dir: "/opt/credentials"
xos_ui_port: 9000
xos_admin_user: "xosadmin@opencord.org"
-xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
+maas_xos_admin_pass: "{{ lookup('file', '/opt/credentials/xosadmin@opencord.org') }}"
diff --git a/roles/test-exampleservice/tasks/main.yml b/roles/test-exampleservice/tasks/main.yml
index 865631c..168697f 100644
--- a/roles/test-exampleservice/tasks/main.yml
+++ b/roles/test-exampleservice/tasks/main.yml
@@ -22,7 +22,7 @@
xostosca:
url: "http://xos.{{ site_suffix }}:{{ xos_ui_port }}/api/utility/tosca/run/"
user: "{{ xos_admin_user }}"
- password: "{{ xos_admin_pass }}"
+ password: "{{ maas_xos_admin_pass }}"
recipe: "{{ lookup('file', head_cord_profile_dir + '/test-exampleservice.yaml' ) }}"
- name: Wait for ExampleService VM to come up