diff options
| -rw-r--r-- | INFO | 33 | ||||
| -rw-r--r-- | INFO.yaml | 37 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 | 4 | ||||
| -rw-r--r-- | deploy/conf/cluster.conf | 2 |
4 files changed, 28 insertions, 48 deletions
@@ -1,33 +0,0 @@ -Project Name: Compass4nfv -Repo name: compass4nfv -Project Category: Integration and testing -Lifecycle State: Proposal approved -Primary Contact: Justin chi(chigang@huawei.com) -Project Lead: Justin chi -Jira Project Name: Compass4nfv -Jira Project Prefix: COMPASS -mailing list tag [COMPASS] -IRC: Server:freenode.net Channel:#opnfv-compass4nfv - -Committers: -Weidong shao (weidong.shao@huawei.com) -Prakash Ramchandran (Prakash.Ramchandran@huawei.com) -Justin chi (chigang@huawei.com) -Chenshuai (chenshuai@huawei.com) -Ashlee Young (ashlee@yunify.com) -Yifei Xue (xueyifei@huawei.com) -Xinhui Hu (xinhui_hu@foxmail.com) -Ramamani yeleswarapu (ramamani.yeleswarapu@intel.com) -Yibo Cai (yibo.cai@arm.com) -Harry Huang (huangxiangyu5@huawei.com) -Tianwei Wu (wutianwei1@huawei.com) - -Link to TSC approval: http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-21-14.02.html - -Link to approval of new PTL: -https://lists.opnfv.org/pipermail/opnfv-tech-discuss/2017-January/014591.html -https://lists.opnfv.org/pipermail/opnfv-tech-discuss/2017-January/014601.html -https://lists.opnfv.org/pipermail/opnfv-tech-discuss/2017-January/014709.html -https://lists.opnfv.org/pipermail/opnfv-tech-discuss/2017-January/014726.html - -Link to approval of additional submitters: @@ -8,7 +8,7 @@ project_lead: &opnfv_compass4nfv_ptl email: 'chigang@huawei.com' id: 'chigang' company: 'huawei.com' - timezone: 'Unknown' + timezone: 'UTC+8' primary_contact: *opnfv_compass4nfv_ptl issue_tracking: type: 'jira' @@ -23,25 +23,18 @@ realtime_discussion: server: 'freenode.net' channel: '#opnfv-compass4nfv' meetings: - - type: 'gotomeeting+irc' - agenda: # eg: 'https://wiki.opnfv.org/display/' - url: # eg: 'https://global.gotomeeting.com/join/819733085' + - type: 'zoom+irc' + agenda: 'https://wiki.opnfv.org/display/meetings/Compass4NFV+Integration+Discuss+Meeting' + url: 'https://zoom.us/j/5014627785' server: 'freenode.net' - channel: '#opnfv-meeting' + channel: '#opnfv-compass4nfv' repeats: 'weekly' - time: # eg: '16:00 UTC' + time: '01:00 UTC' repositories: - 'compass4nfv' + - 'compass-containers' committers: - <<: *opnfv_compass4nfv_ptl - - name: 'Prakash Ramchandran' - email: 'prakash.ramchandran@huawei.com' - company: 'huawei.com' - id: 'rprakash' - - name: 'shuai chen' - email: 'chenshuai@huawei.com' - company: 'huawei.com' - id: 'chenshuai' - name: 'Yifei Xue' email: 'xueyifei@huawei.com' company: 'huawei.com' @@ -50,6 +43,22 @@ committers: email: 'xinhui_hu@foxmail.com' company: 'foxmail.com' id: 'huxinhui' + - name: 'Ramamani yeleswarapu' + email: 'ramamani.yeleswarapu@intel.com' + company: 'intel.com' + id: 'ramay' + - name: 'Yibo Cai' + email: 'yibo.cai@arm.com' + company: 'arm.com' + id: 'yibocai' + - name: 'Tianwei Wu' + email: 'wutianwei1@huawei.com' + company: 'huawei.com' + id: 'wutianwei' + - name: 'Harry Huang' + email: 'huangxiangyu5@huawei.com' + company: 'huawei.com' + id: 'huangxiangyu' tsc: # yamllint disable rule:line-length approval: 'http//ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-21-14.02.html' 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 4f1ea8d5..f025d80e 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 @@ -31,6 +31,10 @@ cinder_cinder_conf_overrides: oslo_middleware: enable_proxy_headers_parsing: True +neutron_neutron_conf_overrides: + oslo_middleware: + enable_proxy_headers_parsing: True + nfs_file_gw: False {% if "openvswitch" == NEUTRON_MECHANISM_DRIVERS[0] or diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf index f62f9ba0..6510f3cb 100644 --- a/deploy/conf/cluster.conf +++ b/deploy/conf/cluster.conf @@ -26,7 +26,7 @@ export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION" if [[ "x"$KUBERNETES_VERSION != "x" ]]; then unset OPENSTACK_VERSION - export DEPLOY_TOOL=${DEPLOY_TOOL:-"k8s"} + export DEPLOY_TOOL="k8s" export ADAPTER_NAME=kubernetes export ADAPTER_FLAVOR_PATTERN=ansible-kubernetes export ADAPTER_TARGET_SYSTEM_PATTERN='^kubernetes$' |