Write ODL ansible script for Ubuntu14.04

JIRA: COMPASS-23

Change-Id: Iad692c8f77492989e29d0a4862989edea1d48fc5
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

8 files changed, 10 insertions, 19 deletions

diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf
index 4818e340..318a8729 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf
@@ -38,7 +38,7 @@ odl-cluster-data {
 
     cluster {
       seed-nodes = [
-{% for host in groups['odl_controller'] %}
+{% for host in groups['odl'] %}
     {% if loop.last %}
                     "akka.tcp://opendaylight-cluster-data@{{ hostvars[host]['ansible_' + INTERNAL_INTERFACE].ipv4.address }}:2550"
     {% else %}
@@ -51,7 +51,7 @@ odl-cluster-data {
 
       roles = [
 {% set key = 0 %}
-{% for host in groups['odl_controller'] %}
+{% for host in groups['odl'] %}
     {% set key = key + 1 %}
     {% if  hostvars[host]['ansible_' + INTERNAL_INTERFACE].ipv4.address  ==  hostvars[inventory_hostname]['ansible_' + INTERNAL_INTERFACE].ipv4.address  %}
         "member-{{ key }}"
@@ -90,7 +90,7 @@ odl-cluster-rpc {
 
     cluster {
       seed-nodes = [
-{% for host in groups['odl_controller'] %}
+{% for host in groups['odl'] %}
     {% if loop.last %}
                     "akka.tcp://odl-cluster-rpc@{{ hostvars[host]['ansible_' + INTERNAL_INTERFACE].ipv4.address }}:2551"
     {% else %}
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/jolokia/jolokia-osgi/1.1.5/jolokia-osgi-1.1.5-features.xml b/deploy/adapters/ansible/roles/odl_cluster/templates/jolokia/jolokia-osgi/1.1.5/jolokia-osgi-1.1.5-features.xml
deleted file mode 100644
index 6242d788..00000000
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/jolokia/jolokia-osgi/1.1.5/jolokia-osgi-1.1.5-features.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="framework-3.0.1">
-    <repository>mvn:org.jolokia/jolokia-osgi/1.1.5/xml/features</repository>
-    <feature name="jolokia-osgi" version="1.1.5" description="Jolokia Agent">
-        <bundle start-level="5" start="true">mvn:org.jolokia/jolokia-osgi/1.1.5</bundle>
-    </feature>
-</features>
-
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/jolokia/jolokia-osgi/1.1.5/jolokia-osgi-1.1.5.jar b/deploy/adapters/ansible/roles/odl_cluster/templates/jolokia/jolokia-osgi/1.1.5/jolokia-osgi-1.1.5.jar
deleted file mode 100644
index 18e8710b..00000000
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/jolokia/jolokia-osgi/1.1.5/jolokia-osgi-1.1.5.jar
+++ /dev/null
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/jolokia/jolokia-osgi/1.1.5/jolokia-osgi-1.1.5.jar.sha1 b/deploy/adapters/ansible/roles/odl_cluster/templates/jolokia/jolokia-osgi/1.1.5/jolokia-osgi-1.1.5.jar.sha1
deleted file mode 100644
index 790e6ef2..00000000
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/jolokia/jolokia-osgi/1.1.5/jolokia-osgi-1.1.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ba513164178626519a6fb12ced4a3d6e1e07dd54
\ No newline at end of file
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh b/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh
index 1ce1e41e..7f61d367 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh
@@ -2,5 +2,5 @@ cat <<EOT>> /etc/neutron/plugins/ml2/ml2_conf.ini
 [ml2_odl]
 password = admin
 username = admin
-url = http://{{ hostvars[inventory_hostname]['ansible_' + INTERNAL_INTERFACE].ipv4.address }}:8080/controller/nb/v2/neutron
+url = http://{{ HA_VIP }}:8080/controller/nb/v2/neutron
 EOT
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf
index 4477b392..9a5d4c38 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/module-shards.conf
@@ -29,7 +29,7 @@ module-shards = [
                 name="default"
                 replicas = [
 {% set key = 0 %}
-{% for host in groups['controller'] %}
+{% for host in groups['odl'] %}
     {% set key = key + 1 %}
         {% if loop.last %}
             "member-{{ key }}"
@@ -48,7 +48,7 @@ module-shards = [
                 name="topology"
                 replicas = [
 {% set key = 0 %}
-{% for host in groups['controller'] %}
+{% for host in groups['odl'] %}
     {% set key = key + 1 %}
         {% if loop.last %}
             "member-{{ key }}"
@@ -67,7 +67,7 @@ module-shards = [
                 name="inventory"
                 replicas = [
 {% set key = 0 %}
-{% for host in groups['controller'] %}
+{% for host in groups['odl'] %}
     {% set key = key + 1 %}
         {% if loop.last %}
             "member-{{ key }}"
@@ -86,7 +86,7 @@ module-shards = [
                      name="toaster"
                      replicas = [
 {% set key = 0 %}
-{% for host in groups['controller'] %}
+{% for host in groups['odl'] %}
     {% set key = key + 1 %}
         {% if loop.last %}
             "member-{{ key }}"
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service
index 61a1dbdc..a4adeeec 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/opendaylight.service
@@ -5,7 +5,7 @@ After=network.service
 
 [Service]
 Type=forking
-ExecStart=/opt/opendaylight-0.2.2/bin/start
+ExecStart=/opt/opendaylight-0.3.0/bin/start
 User=odl
 Group=odl
 
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg
index e53a07b2..4f439c25 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg
@@ -38,7 +38,7 @@
 #
 #featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.1/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.1/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.0/xml/features,mvn:org.apache.karaf.features/spring/3.0.1/xml/features,mvn:org.opendaylight.integration/features-integration/0.2.2-Helium-SR2/xml/features,mvn:org.jolokia/jolokia-osgi/1.1.4/xml/features
 
-featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.1/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.1/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.0/xml/features,mvn:org.apache.karaf.features/spring/3.0.1/xml/features,mvn:org.opendaylight.integration/features-integration/0.2.2-Helium-SR2/xml/features,mvn:org.jolokia/jolokia-osgi/1.1.4/xml/features
+featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.1/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.1/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.0/xml/features,mvn:org.apache.karaf.features/spring/3.0.1/xml/features,mvn:org.opendaylight.integration/features-integration/0.2.2-Helium-SR2/xml/features,mvn:org.jolokia/jolokia-osgi/1.1.5/xml/features
 
 #
 # Comma separated list of features to install at startup