diff options
| -rw-r--r-- | build/build.yaml | 12 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 16 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 | 8 | ||||
| -rw-r--r-- | deploy/conf/compass.conf | 3 | ||||
| -rw-r--r-- | docs/release/installation/installation.rst | 2 | ||||
| -rw-r--r-- | docs/release/installation/introduction.rst | 29 | ||||
| -rw-r--r-- | docs/release/release-notes/release-notes.rst | 11 | ||||
| -rwxr-xr-x | plugins/odl_cluster/roles/setup-odl/tasks/main.yml | 4 | ||||
| -rwxr-xr-x | plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml | 4 | ||||
| -rwxr-xr-x | plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml | 2 |
10 files changed, 42 insertions, 49 deletions
diff --git a/build/build.yaml b/build/build.yaml index 1e088133..178e91b3 100644 --- a/build/build.yaml +++ b/build/build.yaml @@ -13,7 +13,7 @@ packages: - name: compass-deck description: "RESTful API and DB Handlers for Compass" get_method: docker - url: compass4nfv/compass-deck + url: compass4nfv/compass-deck:latest - name: compass-tasks-osa description: "compass task container for openstack deployment via openstack-ansible" @@ -23,28 +23,28 @@ packages: - name: compass-tasks-k8s description: "compass task container for kubernets deployment via kargo" get_method: docker - url: compass4nfv/compass-tasks-k8s + url: compass4nfv/compass-tasks-k8s:latest - name: compass-cobbler description: "cobbler container for compass" get_method: docker - url: compass4nfv/compass-cobbler + url: compass4nfv/compass-cobbler:latest - name: compass-db description: "datebase container for compass" get_method: docker - url: compass4nfv/compass-db + url: compass4nfv/compass-db:latest - name: compass-mq description: "message queue container for compass" get_method: docker - url: compass4nfv/compass-mq + url: compass4nfv/compass-mq:latest - name: yardstick description: "yardstick container for compass" get_method: docker - url: opnfv/yardstick + url: opnfv/yardstick:latest - name: compass-repo-osa-ubuntu description: "compass repo container for deployment" diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index 49f76cc7..3f58435e 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -51,12 +51,18 @@ roles: - setup-openvswitch -- hosts: localhost +- hosts: + - localhost + - neutron_all + - galera_container + - network_hosts + - repo_container + - utility remote_user: root roles: - - setup-sfc + - setup-odl tags: - - sfc + - odl - hosts: - localhost @@ -67,9 +73,9 @@ - utility remote_user: root roles: - - setup-odl + - setup-odl-sfc tags: - - odl + - odl_sfc - hosts: - utility_all[0] diff --git a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 index e43aa22c..ebd8ff09 100644 --- a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 +++ b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 @@ -19,7 +19,7 @@ # ## # # Debug and Verbose options. -debug: false +debug: true haproxy_keepalived_external_vip_cidr: "{{ public_vip.ip }}/32" haproxy_keepalived_internal_vip_cidr: "{{ internal_vip.ip }}/32" @@ -28,8 +28,10 @@ haproxy_keepalived_internal_interface: br-mgmt keepalived_ping_address: "{{ ntp_server }}" cinder_cinder_conf_overrides: - DEFAULT: - public_endpoint: "https://{{ public_vip.ip }}" + oslo_middleware: + enable_proxy_headers_parsing: True + +nfs_file_gw: False {% if "openvswitch" == NEUTRON_MECHANISM_DRIVERS[0] or "opendaylight" == NEUTRON_MECHANISM_DRIVERS[0] diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf index bcf295c9..98ba3027 100644 --- a/deploy/conf/compass.conf +++ b/deploy/conf/compass.conf @@ -14,8 +14,9 @@ export COMPASS_EXTERNAL_GW=${COMPASS_EXTERNAL_GW:-} export LANGUAGE="EN" export TIMEZONE="America/Los_Angeles" export NTP_SERVER="$COMPASS_SERVER" -export NAMESERVERS="$COMPASS_SERVER" +export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"} export COMPASS_REPO_PORT="5151" +export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'} export COMPASS_DECK="compass4nfv/compass-deck" export COMPASS_TASKS="compass4nfv/compass-tasks-osa:euphrates" diff --git a/docs/release/installation/installation.rst b/docs/release/installation/installation.rst index 7c4f99a3..05c5e2ef 100644 --- a/docs/release/installation/installation.rst +++ b/docs/release/installation/installation.rst @@ -6,7 +6,7 @@ Compass4nfv configuration ========================= This document describes providing guidelines on how to install and -configure the Danube release of OPNFV when using Compass as a +configure the Euphrates release of OPNFV when using Compass4nfv as a deployment tool including required software and hardware configurations. diff --git a/docs/release/installation/introduction.rst b/docs/release/installation/introduction.rst index d1a48631..6ffc3d17 100644 --- a/docs/release/installation/introduction.rst +++ b/docs/release/installation/introduction.rst @@ -9,33 +9,4 @@ This document describes how to install the Euphrates release of OPNFV when using Compass4nfv as a deployment tool covering it's limitations, dependencies and required system resources. -Version history -=============== - -+--------------------+--------------------+--------------------+---------------------------+ -| **Date** | **Ver.** | **Author** | **Comment** | -| | | | | -+--------------------+--------------------+--------------------+---------------------------+ -| 2017-09-01 | 4.0.0 | Yifei Xue | Rewritten for | -| | | (HUAWEI) | Compass4nfv E release | -+--------------------+--------------------+--------------------+---------------------------+ -| 2017-02-21 | 3.0.0 | Justin chi | Changes for D release | -| | | (HUAWEI) | | -+--------------------+--------------------+--------------------+---------------------------+ -| 2016-09-13 | 2.1.0 | Yuenan Li | Adjusted the docs | -| | | (HUAWEI) | structure | -+--------------------+--------------------+--------------------+---------------------------+ -| 2016-09-12 | 2.0.0 | Yuenan Li | Rewritten for | -| | | (HUAWEI) | Compass4nfv C release | -+--------------------+--------------------+--------------------+---------------------------+ -| 2016-01-17 | 1.0.0 | Justin chi | Rewritten for | -| | | (HUAWEI) | Compass4nfv B release | -+--------------------+--------------------+--------------------+---------------------------+ -| 2015-12-16 | 0.0.2 | Matthew Li | Minor changes & | -| | | (HUAWEI) | formatting | -+--------------------+--------------------+--------------------+---------------------------+ -| 2015-09-12 | 0.0.1 | Chen Shuai | First draft | -| | | (HUAWEI) | | -+--------------------+--------------------+--------------------+---------------------------+ - diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index dc06bf05..85700385 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -135,6 +135,16 @@ System Limitations **Min Jumphost requirements:** At least 16GB of RAM, 16 core CPU +Scenario Limitations +-------------------- + +**ODL SFC:** In the Euphrates1.0, Compass doesn't integrate OpenStack Tacker +Project yet. However, the SFC related test cases in Functest always use Tacker +as NFVO to delivery VNFFG or SFC related requests to ODL via networking-sfc. +So the odl-sfc scenario of Compass cannot pass the SFC testcases in Functest. +But if you want to use verify SFC in the cluster deployed by Compass, you can +use neutron CLI to achieve the same effect. + Known issues ------------ @@ -145,7 +155,6 @@ Known issues | | the cluster cannot heal itself | | +-----------------------+---------------------------------+-----------------------+ - Test Result =========== The Euphrates release with the Compass4nfv deployment toolchain has undergone QA test diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/main.yml b/plugins/odl_cluster/roles/setup-odl/tasks/main.yml index e65be002..96ca2f96 100755 --- a/plugins/odl_cluster/roles/setup-odl/tasks/main.yml +++ b/plugins/odl_cluster/roles/setup-odl/tasks/main.yml @@ -1,4 +1,6 @@ --- - include: odl-cluster.yml - when: opendaylight is defined and opendaylight == "Enable" + when: + - opendaylight is defined and opendaylight == "Enable" + - odl_sfc is not defined diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml index e65be002..6b226688 100755 --- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml +++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml @@ -1,4 +1,6 @@ --- - include: odl-cluster.yml - when: opendaylight is defined and opendaylight == "Enable" + when: + - opendaylight is defined and opendaylight == "Enable" + - odl_sfc is defined and odl_sfc == "Enable" diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml index 09faaa27..07bf7084 100755 --- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml +++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml @@ -4,7 +4,7 @@ - include_vars: "{{ openstack_passwd_file }}" -- include_vars: odl-pre.yml +- include: odl-pre.yml when: inventory_hostname == "localhost" - include_vars: /tmp/odl-extra-vars.yml |