diff options
19 files changed, 50 insertions, 106 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/files/opendaylight.service b/deploy/adapters/ansible/roles/odl_cluster/files/opendaylight.service index 6c9e4c44..8773ee3c 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/files/opendaylight.service +++ b/deploy/adapters/ansible/roles/odl_cluster/files/opendaylight.service @@ -7,11 +7,10 @@ After= User=root Group=root Type=simple -EnvironmentFile=-/opt/moon-environment -WorkingDirectory=/opt/opendaylight-0.3.0 +WorkingDirectory=/opt/opendaylight-0.5.0 PermissionsStartOnly=true ExecStartPre= -ExecStart=/usr/lib/jvm/java-8-oracle/bin/java -Djava.security.properties=/opt/opendaylight-0.3.0/etc/odl.java.security -server -Xms128M -Xmx2048m -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Djava.endorsed.dirs=/usr/lib/jvm/java-8-oracle/jre/lib/endorsed:/usr/lib/jvm/java-8-oracle/lib/endorsed:/opt/opendaylight-0.3.0/lib/endorsed -Djava.ext.dirs=/usr/lib/jvm/java-8-oracle/jre/lib/ext:/usr/lib/jvm/java-8-oracle/lib/ext:/opt/opendaylight-0.3.0/lib/ext -Dkaraf.instances=/opt/opendaylight-0.3.0/instances -Dkaraf.home=/opt/opendaylight-0.3.0 -Dkaraf.base=/opt/opendaylight-0.3.0 -Dkaraf.data=/opt/opendaylight-0.3.0/data -Dkaraf.etc=/opt/opendaylight-0.3.0/etc -Djava.io.tmpdir=/opt/opendaylight-0.3.0/data/tmp -Djava.util.logging.config.file=/opt/opendaylight-0.3.0/etc/java.util.logging.properties -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -classpath /opt/opendaylight-0.3.0/lib/karaf-jaas-boot.jar:/opt/opendaylight-0.3.0/lib/karaf-jmx-boot.jar:/opt/opendaylight-0.3.0/lib/karaf-org.osgi.core.jar:/opt/opendaylight-0.3.0/lib/karaf.branding-1.2.2-Beryllium-SR2.jar:/opt/opendaylight-0.3.0/lib/karaf.jar org.apache.karaf.main.Main +ExecStart=/usr/lib/jvm/java-8-oracle/bin/java -Djava.security.properties=/opt/opendaylight-0.5.0/etc/odl.java.security -server -Xms128M -Xmx2048m -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+HeapDumpOnOutOfMemoryError -Dcom.sun.management.jmxremote -Djava.endorsed.dirs=/usr/lib/jvm/java-8-oracle/jre/lib/endorsed:/usr/lib/jvm/java-8-oracle/lib/endorsed:/opt/opendaylight-0.5.0/lib/endorsed -Djava.ext.dirs=/usr/lib/jvm/java-8-oracle/jre/lib/ext:/usr/lib/jvm/java-8-oracle/lib/ext:/opt/opendaylight-0.5.0/lib/ext -Dkaraf.instances=/opt/opendaylight-0.5.0/instances -Dkaraf.home=/opt/opendaylight-0.5.0 -Dkaraf.base=/opt/opendaylight-0.5.0 -Dkaraf.data=/opt/opendaylight-0.5.0/data -Dkaraf.etc=/opt/opendaylight-0.5.0/etc -Djava.io.tmpdir=/opt/opendaylight-0.5.0/data/tmp -Djava.util.logging.config.file=/opt/opendaylight-0.5.0/etc/java.util.logging.properties -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true -classpath /opt/opendaylight-0.5.0/lib/karaf.branding-1.7.0-Boron.jar:/opt/opendaylight-0.5.0/lib/karaf-jaas-boot.jar:/opt/opendaylight-0.5.0/lib/karaf.jar:/opt/opendaylight-0.5.0/lib/karaf-org.osgi.core.jar org.apache.karaf.main.Main Restart=on-failure LimitNOFILE=65535 TimeoutStopSec=15 diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml index 1545314d..55b29b3e 100755..100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/00_odl_common.yml @@ -10,4 +10,4 @@ - name: install controller packages action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: common_packages | union(common_packages_noarch) + with_items: "{{ common_packages | union(common_packages_noarch) }}" diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_00_download_packages.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_00_download_packages.yml index ebca876a..6c2063f9 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_00_download_packages.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_00_download_packages.yml @@ -29,5 +29,5 @@ - name: download odl pip package get_url: - url: "http://{{ http_server.stdout_lines[0] }}/pip/{{ networking_odl_pkg_name }}" + url: "http://{{ http_server.stdout_lines[0] }}/pip-openstack/{{ networking_odl_pkg_name }}" dest: /opt/{{ networking_odl_pkg_name }} diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml index 869d264a..f9015ffc 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_04_install_pip_packages.yml @@ -13,9 +13,9 @@ cd /opt tar xf /opt/{{ networking_odl_pkg_name }} rm -rf /opt/{{ networking_odl_pkg_name }} - sed -i 's/^neutron-lib.*/neutron-lib/' networking-odl-2.0.0/requirements.txt - tar zcf /opt/{{ networking_odl_pkg_name }} networking-odl-2.0.0 - rm -rf networking-odl-2.0.0 + sed -i 's/^neutron-lib.*/neutron-lib/' networking-odl-3.2.0/requirements.txt + tar zcf /opt/{{ networking_odl_pkg_name }} networking-odl-3.2.0 + rm -rf networking-odl-3.2.0 cd - - name: odl pip package install diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_07_start_check_odl.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_07_start_check_odl.yml index ee8c3585..f52079de 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_07_start_check_odl.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_07_start_check_odl.yml @@ -28,4 +28,4 @@ - name: check if opendaylight running shell: | netstat -lpen --tcp | grep java | grep 6653; - while [ $? -ne 0 ]; do sleep 10; netstat -lpen --tcp | grep java grep 6653; done + while [ $? -ne 0 ]; do sleep 10; netstat -lpen --tcp | grep java | grep 6653; done diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml index d78a76e0..7dd8bd88 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_odl_controller.yml @@ -29,13 +29,9 @@ - name: stop openstack services include: 01_06_stop_openstack_services.yml -- name: set opendaylight cluster - include: 05_set_opendaylight_cluster.yml - when: groups['odl']|length > 1 - -- name: install moon - include: moon-odl.yml - when: moon == "Enable" +# - name: set opendaylight cluster +# include: 05_set_opendaylight_cluster.yml +# when: groups['odl']|length > 1 - name: start and check odl include: 01_07_start_check_odl.yml diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml index 7506200b..7506200b 100755..100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/02_odl_compute.yml diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml index f060e7bb..2a9622f9 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_02_openvswitch_connect_opendaylight.yml @@ -8,6 +8,9 @@ ############################################################################## --- +- name: add ovsdb_connection to neutron.conf + shell: crudini --set /etc/neutron/neutron.conf OVS ovsdb_connection tcp:127.0.0.1:6639 + - name: restart keepalived to recover external IP before check br-int shell: service keepalived restart when: inventory_hostname in groups['odl'] @@ -20,7 +23,7 @@ - name: set opendaylight as the manager command: | - su -s /bin/sh -c "ovs-vsctl set-manager tcp:{{ internal_vip.ip }}:6640;" + su -s /bin/sh -c "ovs-vsctl set-manager ptcp:6639:127.0.0.1 tcp:{{ internal_vip.ip }}:6640;" - name: check br-int shell: | diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_04_setup_ml2.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_04_setup_ml2.yml index ae0dd6cc..febe72be 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/03_04_setup_ml2.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/03_04_setup_ml2.yml @@ -10,12 +10,10 @@ - name: configure opendaylight -> ml2 shell: > - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 \ - mechanism_drivers opendaylight; - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 \ - tenant_network_types vxlan; - crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs \ - enable_tunneling "True"; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers opendaylight; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vxlan; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ovs enable_tunneling "True"; + crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security; - name: copy ml2 configuration script template: diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/moon-odl.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/moon-odl.yml deleted file mode 100644 index ec05f6ce..00000000 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/moon-odl.yml +++ /dev/null @@ -1,65 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- - -- name: delete data journal snapshots - shell: rm -rf {{ odl_home }}/{{ item }} - with_items: - - journal - - data - - snapshots - -- name: remove aaa feature - shell: rm -rf {{ odl_home }}/system/org/opendaylight/aaa/ - -- name: download apache maven package file - get_url: - url: "http://{{ http_server.stdout_lines[0] }}/packages/moon/apache-maven-3.3.9-bin.tar.gz" - dest: /opt/apache-maven-3.3.9-bin.tar.gz - -- name: create maven folder - shell: mkdir -p /opt/apache-maven-3.3.9/ - -- name: extract maven - command: | - su -s /bin/sh -c "tar zxf /opt/apache-maven-3.3.9-bin.tar.gz -C \ - /opt/apache-maven-3.3.9/ --strip-components 1 --no-overwrite-dir -k \ - --skip-old-files" root - -- name: install maven - shell: ln -s /opt/apache-maven-3.3.9/bin/mvn /usr/local/bin/mvn; - -- name: create m2 directory - file: path=/root/.m2/ state=directory mode=0755 - -- name: copy settings.xml - template: src=settings.xml dest=/root/.m2/settings.xml - -- name: download odl-aaa-moon package - get_url: - url: "http://{{ http_server.stdout_lines[0] }}/packages/moon/{{ odl_aaa_moon }}" - dest: /home/ - -- name: unarchive odl-aaa-moon package - command: su -s /bin/sh -c "tar xvf /home/{{ odl_aaa_moon }} -C /home/" - -- name: install aaa - shell: > - export PATH=$PATH:/usr/lib/jvm/java-8-oracle/bin:/opt/apache-maven-3.3.3/bin; - export JAVA_HOME="/usr/lib/jvm/java-8-oracle"; - export _JAVA_OPTIONS="-Djava.net.preferIPv4Stack=true"; - export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=512m"; - cd /home/odl-aaa-moon/aaa/; - mvn clean install -DskipTests; - -- name: remove shiro ini - shell: rm -f {{ odl_home }}/etc/shiro.ini - -- name: set moon env - template: src=moon-environment dest=/opt/moon-environment diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/custom.properties b/deploy/adapters/ansible/roles/odl_cluster/templates/custom.properties index 4eb86184..4eb86184 100644..100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/custom.properties +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/custom.properties diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml b/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml index 50ac7c35..064e8a89 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml @@ -34,7 +34,7 @@ DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> <Arg> <New class="org.eclipse.jetty.server.nio.SelectChannelConnector"> <Set name="host"> - <Property name="jetty.host"/> + <Property name="jetty.host" /> </Set> <Set name="port"> <Property name="jetty.port" default="8181" /> @@ -48,6 +48,24 @@ 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="8080" /> + </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/roles/odl_cluster/templates/keepalived.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/keepalived.conf index 4ccf1c43..4ccf1c43 100644..100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/keepalived.conf +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/keepalived.conf 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 5e3627bf..0d42e48b 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh @@ -10,5 +10,5 @@ cat <<EOT>> /etc/neutron/plugins/ml2/ml2_conf.ini [ml2_odl] password = admin username = admin -url = http://{{ internal_vip.ip }}:8181/controller/nb/v2/neutron +url = http://{{ internal_vip.ip }}:8080/controller/nb/v2/neutron EOT diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/moon-environment b/deploy/adapters/ansible/roles/odl_cluster/templates/moon-environment index 9a13da8e..9a13da8e 100644..100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/moon-environment +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/moon-environment diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian index 4bbd33c3..f3f6ad54 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/org.apache.karaf.features.cfg.Debian @@ -36,23 +36,19 @@ # # Comma separated list of features repositories to register by default # -featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.4.2-Beryllium-SR2/xml/features -#featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.4.0-Beryllium/xml/features -#featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.4.0-Beryllium-RC1/xml/features -#mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.3.3-Lithium-SR3/xml/features -#mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.3.2-Lithium-SR2/xml/features +featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.7/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.7/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.2.9/xml/features,mvn:org.apache.karaf.features/spring/3.0.7/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.5.0-Boron/xml/features # # Comma separated list of features to install at startup # -featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-aaa-authn,odl-dlux-all,odl-ovsdb-openstack - -#,odl-restconf-all,odl-aaa-authn,odl-dlux-all - -# odl-base-all,odl-restconf,odl-ovsdb-openstack,odl-dlux-all,odl-mdsal-apidocs -#,odl-mdsal-clustering,odl-openflowplugin-flow-services +featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-aaa-authn,odl-dlux-all,odl-ovsdb-openstack,odl-base-all,odl-nsf-all,odl-adsal-northbound,odl-mdsal-apidocs,odl-ovsdb-northbound,odl-dlux-core # # Defines if the boot features are started in asynchronous mode (in a dedicated thread) # featuresBootAsynchronous=false + +# +# Store cfg file for config element in feature +# +#configCfgStore=true diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/settings.xml b/deploy/adapters/ansible/roles/odl_cluster/templates/settings.xml index 5ba3b50c..5ba3b50c 100644..100755 --- a/deploy/adapters/ansible/roles/odl_cluster/templates/settings.xml +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/settings.xml diff --git a/deploy/adapters/ansible/roles/odl_cluster/vars/Debian.yml b/deploy/adapters/ansible/roles/odl_cluster/vars/Debian.yml index 46a0d6fb..65666203 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/vars/Debian.yml @@ -18,4 +18,4 @@ service_file: src: opendaylight.service dst: /lib/systemd/system/opendaylight.service -networking_odl_pkg_name: networking-odl-2.0.0.tar.gz +networking_odl_pkg_name: networking-odl-3.2.0.tar.gz diff --git a/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml b/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml index 88d4d07d..4ee7ecf7 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml @@ -14,9 +14,9 @@ odl_api_port: 8181 # odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/ # opendaylight/integration/distribution-karaf/0.3.0-Lithium/ # distribution-karaf-0.3.0-Lithium.tar.gz -odl_pkg_url: karaf.tar.gz -odl_pkg_name: karaf.tar.gz -odl_home: "/opt/opendaylight-0.3.0/" +odl_pkg_url: distribution-karaf-0.5.0-Boron.tar.gz +odl_pkg_name: distribution-karaf-0.5.0-Boron.tar.gz +odl_home: "/opt/opendaylight-0.5.0/" odl_base_features: - config - standard @@ -45,7 +45,6 @@ odl_extra_features: odl_features: "{{ odl_base_features + odl_extra_features }}" -odl_aaa_moon: odl-aaa-moon.tar.gz jdk8_pkg_name: jdk-8u51-linux-x64.tar.gz jdk8_script_name: install_jdk8.tar |