add moon to opendaylight

JIRA: COMPASS-463

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

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
index dc7cbfd..1300ab6 100644 (file)
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
@@ -109,41 +109,41 @@
   roles:
     - secgroup
 
-#- hosts: ceph_adm
-#  remote_user: root
-#  accelerate: true
-#  max_fail_percentage: 0
-#  roles: []
-#  #  - ceph-deploy
-#
-#- hosts: ceph
-#  remote_user: root
-#  accelerate: true
-#  max_fail_percentage: 0
-#  roles:
-#    - ceph-purge
-#    - ceph-config
-#
-#- hosts: ceph_mon
-#  remote_user: root
-#  accelerate: true
-#  max_fail_percentage: 0
-#  roles:
-#    - ceph-mon
-#
-#- hosts: ceph_osd
-#  remote_user: root
-#  accelerate: true
-#  max_fail_percentage: 0
-#  roles:
-#    - ceph-osd
-#
-#- hosts: ceph
-#  remote_user: root
-#  accelerate: true
-#  max_fail_percentage: 0
-#  roles:
-#    - ceph-openstack
+- hosts: ceph_adm
+  remote_user: root
+  accelerate: true
+  max_fail_percentage: 0
+  roles: []
+  #  - ceph-deploy
+
+- hosts: ceph
+  remote_user: root
+  accelerate: true
+  max_fail_percentage: 0
+  roles:
+    - ceph-purge
+    - ceph-config
+
+- hosts: ceph_mon
+  remote_user: root
+  accelerate: true
+  max_fail_percentage: 0
+  roles:
+    - ceph-mon
+
+- hosts: ceph_osd
+  remote_user: root
+  accelerate: true
+  max_fail_percentage: 0
+  roles:
+    - ceph-osd
+
+- hosts: ceph
+  remote_user: root
+  accelerate: true
+  max_fail_percentage: 0
+  roles:
+    - ceph-openstack
 
 - hosts: all
   remote_user: root

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/main.yml
index 40e1c98..a3511de 100644 (file)
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/main.yml
@@ -7,10 +7,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-- include_vars: "{{ ansible_os_family }}.yml"
-
-- include: moon-controller.yml
-  when: inventory_hostname in groups['controller']
-
-- include: moon-compute.yml
-  when: inventory_hostname in groups['compute']
+- include: moon.yml
+  when: moon == "Enable"

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon.yml
new file mode 100644 (file)
index 0000000..40e1c98
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon.yml
@@ -0,0 +1,16 @@
+#############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+- include_vars: "{{ ansible_os_family }}.yml"
+
+- include: moon-controller.yml
+  when: inventory_hostname in groups['controller']
+
+- include: moon-compute.yml
+  when: inventory_hostname in groups['compute']

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/templates/jetty.xml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/templates/jetty.xml
index 146b9b5..50ac7c3 100755 (executable)
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/templates/jetty.xml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/templates/jetty.xml
@@ -48,24 +48,6 @@ DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
             </New>
         </Arg>
     </Call>
-    <Call name="addConnector">
-      <Arg>
-        <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
-          <Set name="host">
-            <Property name="jetty.host"/>
-          </Set>
-          <Set name="port">
-            <Property name="jetty.port" default="8181" />
-          </Set>
-          <Set name="maxIdleTime">300000</Set>
-          <Set name="Acceptors">2</Set>
-          <Set name="statsOn">false</Set>
-          <Set name="confidentialPort">8443</Set>
-          <Set name="lowResourcesConnections">20000</Set>
-          <Set name="lowResourcesMaxIdleTime">5000</Set>
-        </New>
-      </Arg>
-    </Call>
 
     <!-- =========================================================== -->
     <!-- Configure Authentication Realms -->

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml
index 4e2651a..0f08314 100644 (file)
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml
@@ -7,73 +7,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-- include_vars: "{{ ansible_os_family }}.yml"
-
-- include: swift-controller1.yml
-  when: inventory_hostname in groups['controller']
-
-- include: swift-compute1.yml
-  when: inventory_hostname in groups['compute']
-
-- include: swift-controller2.yml
-  when: inventory_hostname == haproxy_hosts.keys()[0]
-
-- name: copy swift.conf
-  template: src=swift.conf dest=/etc/swift/swift.conf backup=yes
-
-- name: chown /etc/swift
-  shell: chown -R root:swift /etc/swift
-
-- name: restart tasks on controller
-  service: name={{ item }} state=restarted enabled=yes
-  with_items:
-    - memcached
-    - swift-proxy
-  when: inventory_hostname in groups['controller']
-
-- name: restart tasks on compute
-  shell: swift-init all start
-  when: inventory_hostname in groups['compute']
-  ignore_errors: True
-
-- name: restart tasks on controller
-  service: name={{ item }} state=restarted enabled=yes
-  with_items:
-    - rsync
-  when: inventory_hostname in groups['compute']
-
-- name: upload swift lib
-  unarchive: src=swift-lib.tar.gz dest=/tmp/
-
-- name: copy swift lib
-  command: su -s /bin/sh -c "cp /tmp/swift-lib/* /usr/lib/"
-
-- name: wait 30 seconds
-  shell: sleep 30
-
-- name: create swift task script
-  shell: echo {{ item }} >> /opt/swift-service
-  with_items:
-    - swift-account
-    - swift-account-replicator
-    - swift-container-replicator
-    - swift-object
-    - swift-object-updater
-    - swift-account-auditor
-    - swift-container
-    - swift-container-sync
-    - swift-object-auditor
-    - swift-account-reaper
-    - swift-container-auditor
-    - swift-container-updater
-    - swift-object-replicator
-  when: inventory_hostname in groups['compute']
-  ignore_errors: True
-
-- name: restart swift task
-  shell: >
-    for i in `cat /opt/swift-service`; do service $i start; done;
-    sleep 10;
-    for i in `cat /opt/swift-service`; do service $i restart; done;
-  when: inventory_hostname in groups['compute']
-  ignore_errors: True
+- include: swift.yml
+  when: moon == "Enable"

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml
new file mode 100644 (file)
index 0000000..4e2651a
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift.yml
@@ -0,0 +1,79 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+- include_vars: "{{ ansible_os_family }}.yml"
+
+- include: swift-controller1.yml
+  when: inventory_hostname in groups['controller']
+
+- include: swift-compute1.yml
+  when: inventory_hostname in groups['compute']
+
+- include: swift-controller2.yml
+  when: inventory_hostname == haproxy_hosts.keys()[0]
+
+- name: copy swift.conf
+  template: src=swift.conf dest=/etc/swift/swift.conf backup=yes
+
+- name: chown /etc/swift
+  shell: chown -R root:swift /etc/swift
+
+- name: restart tasks on controller
+  service: name={{ item }} state=restarted enabled=yes
+  with_items:
+    - memcached
+    - swift-proxy
+  when: inventory_hostname in groups['controller']
+
+- name: restart tasks on compute
+  shell: swift-init all start
+  when: inventory_hostname in groups['compute']
+  ignore_errors: True
+
+- name: restart tasks on controller
+  service: name={{ item }} state=restarted enabled=yes
+  with_items:
+    - rsync
+  when: inventory_hostname in groups['compute']
+
+- name: upload swift lib
+  unarchive: src=swift-lib.tar.gz dest=/tmp/
+
+- name: copy swift lib
+  command: su -s /bin/sh -c "cp /tmp/swift-lib/* /usr/lib/"
+
+- name: wait 30 seconds
+  shell: sleep 30
+
+- name: create swift task script
+  shell: echo {{ item }} >> /opt/swift-service
+  with_items:
+    - swift-account
+    - swift-account-replicator
+    - swift-container-replicator
+    - swift-object
+    - swift-object-updater
+    - swift-account-auditor
+    - swift-container
+    - swift-container-sync
+    - swift-object-auditor
+    - swift-account-reaper
+    - swift-container-auditor
+    - swift-container-updater
+    - swift-object-replicator
+  when: inventory_hostname in groups['compute']
+  ignore_errors: True
+
+- name: restart swift task
+  shell: >
+    for i in `cat /opt/swift-service`; do service $i start; done;
+    sleep 10;
+    for i in `cat /opt/swift-service`; do service $i restart; done;
+  when: inventory_hostname in groups['compute']
+  ignore_errors: True

diff --git a/deploy/conf/vm_environment/os-odl_l2-moon-noha.yml b/deploy/conf/vm_environment/os-odl_l2-moon-noha.yml
new file mode 100644 (file)
index 0000000..e689875
--- /dev/null
+++ b/deploy/conf/vm_environment/os-odl_l2-moon-noha.yml
@@ -0,0 +1,31 @@
+TYPE: virtual
+FLAVOR: cluster
+
+moon: "Enable"
+
+hosts:
+  - name: host1
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host2
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host3
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host4
+    roles:
+      - compute
+
+  - name: host5
+    roles:
+      - compute