change to using public maven repo instead of local compilation
don't try to use delete onos-load-app role
variable name fix
added onos-app, curl to onos container
use correct name for running xos/onos container
fix path on onos-app in script
rework CORD app loading so it happens from head node
whitespace
Dockerfile cleanup, whitespace
fix variable name
fix paths and executable status on scripts
more path fixing
missing slash
Change-Id: I4b1204d044b12c2cec331a369dc01975f33ee96c
diff --git a/roles/onos-vm-install/files/Dockerfile.xos-onos b/roles/onos-vm-install/files/Dockerfile.xos-onos
deleted file mode 100644
index 6ac780b..0000000
--- a/roles/onos-vm-install/files/Dockerfile.xos-onos
+++ /dev/null
@@ -1,18 +0,0 @@
-# ONOS dockerfile with XOS additions
-
-#FROM xosproject/onos-fork
-FROM onosproject/onos:1.6
-MAINTAINER Zack Williams <zdw@cs.arizona.edu>
-
-# Include SSL certs
-COPY xos-certs.crt /usr/local/share/ca-certificates/xos-certs.crt
-RUN update-ca-certificates
-
-# Create Java KeyStore from certs
-RUN openssl x509 -in /usr/local/share/ca-certificates/xos-certs.crt -outform der -out /usr/local/share/ca-certificates/xos-certs.der
-RUN keytool -import -noprompt -storepass 222222 -alias xos-certs -file /usr/local/share/ca-certificates/xos-certs.der -keystore /usr/local/share/ca-certificates/xos-certs.jks
-
-# Updated onos-service to use the jks
-COPY onos-service /root/onos/bin/onos-service
-RUN chmod 755 /root/onos/bin/onos-service
-
diff --git a/roles/onos-vm-install/files/onos-service b/roles/onos-vm-install/files/onos-service
deleted file mode 100644
index 7d810c4..0000000
--- a/roles/onos-vm-install/files/onos-service
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-# -----------------------------------------------------------------------------
-# Starts ONOS Apache Karaf container
-# -----------------------------------------------------------------------------
-
-# uncomment the following line for performance testing
-#export JAVA_OPTS="${JAVA_OPTS:--Xms8G -Xmx8G -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+PrintGCDetails -XX:+PrintGCTimeStamps}"
-
-# uncomment the following line for Netty TLS encryption
-# Do modify the keystore location/password and truststore location/password accordingly
-#export JAVA_OPTS="${JAVA_OPTS:--DenableNettyTLS=true -Djavax.net.ssl.keyStore=/home/ubuntu/onos.jks -Djavax.net.ssl.keyStorePassword=222222 -Djavax.net.ssl.trustStore=/home/ubuntu/onos.jks -Djavax.net.ssl.trustStorePassword=222222}"
-
-export JAVA_OPTS="-Djavax.net.ssl.trustStore=/usr/local/share/ca-certificates/xos-certs.jks -Djavax.net.ssl.trustStorePassword=222222"
-
-set -e # exit on error
-set -u # exit on undefined variable
-
-# If ONOS_HOME is set, respect its value.
-# If ONOS_HOME is not set (e.g. in the init or service environment),
-# set it based on this script's path.
-ONOS_HOME=${ONOS_HOME:-$(cd $(dirname $0)/.. >/dev/null 2>&1 && pwd)}
-KARAF_ARGS=
-SYS_APPS=drivers
-ONOS_APPS=${ONOS_APPS:-} # Empty means don't activate any new apps
-
-cd $ONOS_HOME
-
-# Parse out arguments destinted for karaf invocation v. arguments that
-# will be processed in line
-while [ $# -gt 0 ]; do
- case $1 in
- apps-clean)
- # Deactivate all applications
- find ${ONOS_HOME}/apps -name "active" -exec rm \{\} \;
- ;;
- *)
- KARAF_ARGS+=" $1"
- ;;
- esac
- shift
-done
-
-# Activate the system required applications (SYS_APPS) as well as any
-# specified applications in the var ONOS_APPS
-for app in ${SYS_APPS//,/ } ${ONOS_APPS//,/ }; do
- if [[ "$app" =~ \. ]]; then
- touch ${ONOS_HOME}/apps/$app/active
- else
- touch ${ONOS_HOME}/apps/org.onosproject.$app/active
- fi
-done
-
-exec ${ONOS_HOME}/apache-karaf-3.0.5/bin/karaf $KARAF_ARGS
diff --git a/roles/onos-vm-install/files/onos-setup-playbook.yml b/roles/onos-vm-install/files/onos-setup-playbook.yml
index 4ab44cb..fe33054 100644
--- a/roles/onos-vm-install/files/onos-setup-playbook.yml
+++ b/roles/onos-vm-install/files/onos-setup-playbook.yml
@@ -9,12 +9,13 @@
- name: Create CORD directory
file:
- path={{ ansible_user_dir }}/cord
- state=directory
+ path: "{{ ansible_user_dir }}/cord"
+ state: directory
+# Should replace with http://docs.ansible.com/ansible/docker_module.html, when replacements are stable
- name: Pull docker image for ONOS
become: yes
- command: docker pull onosproject/onos:1.6
+ command: "docker pull {{ onos_docker_image }}"
# Setup specific for onos-cord VM
- hosts: onos-cord-1
@@ -23,22 +24,23 @@
tasks:
- name: Copy over SSH key
copy:
- src={{ node_private_key }}
- dest={{ ansible_user_dir }}/cord/node_key
- owner={{ ansible_user_id }} mode=0600
+ src: "{{ node_private_key }}"
+ dest: "{{ ansible_user_dir }}/cord/node_key"
+ owner: "{{ ansible_user_id }}"
+ mode: 0600
- name: Copy over files to build XOS variant of ONOS
copy:
- src="~/{{ item }}"
- dest="{{ ansible_user_dir }}/cord/{{ item }}"
+ src: "~/{{ item }}"
+ dest: "{{ ansible_user_dir }}/cord/{{ item }}"
with_items:
- Dockerfile.xos-onos
- onos-service
- name: Copy over & rename docker-compose file
copy:
- src=~/onos-docker-compose.yml
- dest={{ ansible_user_dir }}/cord/docker-compose.yml
+ src: "~/onos-docker-compose.yml"
+ dest: "{{ ansible_user_dir }}/cord/docker-compose.yml"
- hosts: onos-fabric-1
remote_user: ubuntu
@@ -46,5 +48,5 @@
tasks:
- name: Copy over & rename docker-compose file
copy:
- src=~/fabric-docker-compose.yml
- dest={{ ansible_user_dir }}/cord/docker-compose.yml
+ src: "~/fabric-docker-compose.yml"
+ dest: "{{ ansible_user_dir }}/cord/docker-compose.yml"