summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild.sh8
-rw-r--r--build/build.conf3
-rw-r--r--deploy/adapters/ansible/openstack/templates/nova.conf5
-rwxr-xr-xdeploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml42
-rw-r--r--deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf1
-rw-r--r--deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf5
-rw-r--r--deploy/adapters/ansible/roles/cinder-volume/vars/Debian.yml1
-rw-r--r--deploy/adapters/ansible/roles/cinder-volume/vars/RedHat.yml1
-rw-r--r--deploy/adapters/ansible/roles/memcached/tasks/main.yml15
-rwxr-xr-xdeploy/network.sh2
-rw-r--r--docs/release/installation/offline-deploy.rst3
-rw-r--r--repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl2
-rw-r--r--repo/openstack/special_pkg/Debian/make_openvswitch-switch.sh2
-rw-r--r--repo/repo.conf4
14 files changed, 63 insertions, 31 deletions
diff --git a/build.sh b/build.sh
index 3dfd54fd..800d627a 100755
--- a/build.sh
+++ b/build.sh
@@ -21,7 +21,7 @@ WORK_PATH=$COMPASS_PATH
PACKAGES="fuse fuseiso createrepo genisoimage curl"
# PACKAGE_URL will be reset in Jenkins for different branch
-export PACKAGE_URL=${PACKAGE_URL:-http://205.177.226.237:9999}
+export PACKAGE_URL=${PACKAGE_URL:-http://artifacts.opnfv.org/compass4nfv/package/master}
mkdir -p $WORK_DIR
@@ -74,6 +74,12 @@ function download_url()
fi
curl --connect-timeout 10 -o $CACHE_DIR/$1 $2
+ local_md5=`md5sum $CACHE_DIR/$1 | cut -d ' ' -f 1`
+ repo_md5=`cat $CACHE_DIR/$1.md5 | cut -d ' ' -f 1`
+ if [[ $local_md5 != $repo_md5 ]]; then
+ echo "ERROR, the md5sum don't match"
+ exit 1
+ fi
}
function download_local()
diff --git a/build/build.conf b/build/build.conf
index cb56e32a..101f01ba 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -1,8 +1,5 @@
TIMEOUT=10
-# PACKAGE_URL will be reset in Jenkins for different branch
-#export PACKAGE_URL=${PACKAGE_URL:-http://205.177.226.237:9999}
-
# Jumphost OS version
export CENTOS_BASE=${CENTOS_BASE:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1511.iso}
diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf
index eb7ec053..114453ee 100644
--- a/deploy/adapters/ansible/openstack/templates/nova.conf
+++ b/deploy/adapters/ansible/openstack/templates/nova.conf
@@ -37,7 +37,6 @@ instance_usage_audit_period = hour
notify_on_state_change = vm_and_task_state
notification_driver = nova.openstack.common.notifier.rpc_notifier
notification_driver = ceilometer.compute.nova_notifier
-memcached_servers = {{ memcached_servers }}
osapi_compute_workers = {{ api_workers }}
metadata_workers = {{ api_workers }}
@@ -119,3 +118,7 @@ rabbit_password = {{ RABBIT_PASS }}
rabbit_port = 5672
rabbit_userid = {{ RABBIT_USER }}
+[cache]
+backend = dogpile.cache.memcached
+enabled = True
+memcache_servers = {{ memcached_servers }}
diff --git a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml
index 84515267..5d9138bb 100755
--- a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml
+++ b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml
@@ -56,24 +56,30 @@
/etc/cinder/cinder.conf;
sed -i 's/^\(rbd_secret_uuid\).*/\1 = {{ ceph_uuid }}/g' \
/etc/cinder/cinder.conf;
- sed -i '/^\[DEFAULT/a rbd_pool = volumes' \
- /etc/cinder/cinder.conf;
- sed -i '/^\[DEFAULT/a rbd_ceph_conf = /etc/ceph/ceph.conf' \
- /etc/cinder/cinder.conf;
- sed -i '/^\[DEFAULT/a rbd_flatten_volume_from_snapshot = false' \
- /etc/cinder/cinder.conf;
- sed -i '/^\[DEFAULT/a rbd_max_clone_depth = 5' \
- /etc/cinder/cinder.conf;
- sed -i '/^\[DEFAULT/a rbd_store_chunk_size = 4' \
- /etc/cinder/cinder.conf;
- sed -i '/^\[DEFAULT/a rados_connect_timeout = -1' \
- /etc/cinder/cinder.conf;
- sed -i '/^\[DEFAULT/a glance_api_version = 2' \
- /etc/cinder/cinder.conf;
- sed -i '/^\[DEFAULT/a rbd_user = cinder' \
- /etc/cinder/cinder.conf;
- sed -i '/^\[DEFAULT/a rbd_secret_uuid = {{ ceph_uuid }}' \
- /etc/cinder/cinder.conf;
+ crudini --set /etc/cinder/cinder.conf DEFAULT enabled_backends \
+ ceph;
+ crudini --del /etc/cinder/cinder.conf lvm
+ crudini --set /etc/cinder/cinder.conf ceph volume_driver \
+ cinder.volume.drivers.rbd.RBDDriver;
+ crudini --set /etc/cinder/cinder.conf ceph volume_backend_name \
+ ceph;
+ crudini --set /etc/cinder/cinder.conf ceph rbd_pool volumes;
+ crudini --set /etc/cinder/cinder.conf ceph rbd_ceph_conf \
+ /etc/ceph/ceph.conf;
+ crudini --set /etc/cinder/cinder.conf ceph rbd_flatten_volume_from_snapshot \
+ false;
+ crudini --set /etc/cinder/cinder.conf ceph rbd_max_clone_depth \
+ 5;
+ crudini --set /etc/cinder/cinder.conf ceph rbd_store_chunk_size \
+ 4;
+ crudini --set /etc/cinder/cinder.conf ceph rados_connect_timeout \
+ -1;
+ crudini --set /etc/cinder/cinder.conf ceph glance_api_version \
+ 2;
+ crudini --set /etc/cinder/cinder.conf ceph rbd_user \
+ cinder;
+ crudini --set /etc/cinder/cinder.conf ceph rbd_secret_uuid \
+ {{ ceph_uuid }};
when: inventory_hostname in groups['compute']
tags:
- ceph_conf_cinder
diff --git a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
index 4ad2da2e..25d3cdd9 100644
--- a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
+++ b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
@@ -51,7 +51,6 @@ iscsi_port = 3260
iscsi_helper = tgtadm
volumes_dir = /var/lib/cinder/volumes
-volume_driver = cinder.volume.drivers.lvm.LVMISCSIDriver
[database]
connection = mysql://cinder:{{ CINDER_DBPASS }}@{{ db_host }}/cinder
diff --git a/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf
index e7946b5c..9a5ca005 100644
--- a/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf
+++ b/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf
@@ -17,6 +17,8 @@ control_exchange = cinder
rpc_backend = rabbit
my_ip = {{ storage_controller_host }}
+enabled_backends = lvm
+
glance_host = {{ internal_vip.ip }}
glance_port = 9292
glance_api_servers = http://{{ internal_vip.ip }}:9292
@@ -44,7 +46,6 @@ iscsi_port=3260
iscsi_helper=tgtadm
volumes_dir=/var/lib/cinder/volumes
-volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
[database]
connection = mysql://cinder:{{ CINDER_DBPASS }}@{{ db_host }}/cinder
@@ -67,7 +68,7 @@ admin_password = {{ CINDER_PASS }}
[lvm]
volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver
-volume_group = cinder-volumes
+volume_group = storage-volumes
iscsi_protocol = iscsi
iscsi_helper = tgtadm
diff --git a/deploy/adapters/ansible/roles/cinder-volume/vars/Debian.yml b/deploy/adapters/ansible/roles/cinder-volume/vars/Debian.yml
index d95b779c..8c3cb728 100644
--- a/deploy/adapters/ansible/roles/cinder-volume/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/cinder-volume/vars/Debian.yml
@@ -12,3 +12,4 @@ packages:
services:
- cinder-volume
+ - tgt
diff --git a/deploy/adapters/ansible/roles/cinder-volume/vars/RedHat.yml b/deploy/adapters/ansible/roles/cinder-volume/vars/RedHat.yml
index 6d596f4b..892c66d8 100644
--- a/deploy/adapters/ansible/roles/cinder-volume/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/cinder-volume/vars/RedHat.yml
@@ -17,3 +17,4 @@ packages:
services:
- openstack-cinder-volume
- lvm2-lvmetad
+ - target
diff --git a/deploy/adapters/ansible/roles/memcached/tasks/main.yml b/deploy/adapters/ansible/roles/memcached/tasks/main.yml
index a4457f36..2b4b7ec7 100644
--- a/deploy/adapters/ansible/roles/memcached/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/memcached/tasks/main.yml
@@ -19,6 +19,8 @@
- name: install packages
action: "{{ ansible_pkg_mgr }} name={{ item }} state=latest update_cache=yes"
with_items: "{{ packages | union(packages_noarch) }}"
+ notify:
+ - restart memcahed services
- name: enable auto start
file:
@@ -32,4 +34,17 @@
notify:
- restart memcahed services
+- name: change memcache listen ip
+ lineinfile:
+ dest=/etc/sysconfig/memcached
+ regexp="^OPTIONS=.*"
+ line="OPTIONS=\"-l 0.0.0.0\""
+ when: ansible_os_family == "RedHat"
+ notify:
+ - restart memcahed services
+
+- name: generate memcached service list
+ lineinfile: dest=/opt/service create=yes line='{{ item }}'
+ with_items: "{{ services | union(services_noarch) }}"
+
- meta: flush_handlers
diff --git a/deploy/network.sh b/deploy/network.sh
index 558d690c..0f5a7d5d 100755
--- a/deploy/network.sh
+++ b/deploy/network.sh
@@ -47,6 +47,7 @@ function save_network_info()
ip_info=`ip addr show $external_nic|grep -Eo '[^ ]+ brd [^ ]+ '`
if [ $br_exist -eq 0 ]; then
if [ "$external_nic" != "br-external" ]; then
+ sudo ip link set br-external up
sudo ovs-vsctl --may-exist add-port br-external $external_nic
sudo ip addr flush $external_nic
sudo ip addr add $ip_info dev br-external
@@ -54,6 +55,7 @@ function save_network_info()
fi
else
sudo ovs-vsctl add-br br-external
+ sudo ip link set br-external up
sudo ovs-vsctl add-port br-external $external_nic
sudo ip addr flush $external_nic
sudo ip addr add $ip_info dev br-external
diff --git a/docs/release/installation/offline-deploy.rst b/docs/release/installation/offline-deploy.rst
index c854f87d..0acfa180 100644
--- a/docs/release/installation/offline-deploy.rst
+++ b/docs/release/installation/offline-deploy.rst
@@ -15,7 +15,8 @@ Preparation for offline deploy
generated by script build.sh in compass4nfv root directory.)
2. Download the Jumphost preparation package from our httpserver. (Download the
- jumphost environment package from `here <http://205.177.226.237:9999/jh_env_package.tar.gz>`_.
+ jumphost environment package from
+ `here <http://artifacts.opnfv.org/compass4nfv/package/master/jh_env_package.tar.gz>`_.
It should be awared that currently we only support ubuntu trusty as offline
jumphost OS.)
diff --git a/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl b/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl
index f2a14f48..7bec8878 100644
--- a/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl
+++ b/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl
@@ -65,7 +65,7 @@ rm -rf /var/cache/apt/python-pyasn1_0.1.7-1ubuntu2_all.deb
# Ubuntu16.04.1 LTS only have gcc-5-base_5.4.0-6ubuntu1~16.04.1, nova-novncproxy need
# gcc-5-base_5.4.0-6ubuntu1~16.04.2, but the docker could not download gcc-5-base package.
-wget http://205.177.226.237:9999/nova-novncproxy_xenial_newton.tar.gz
+wget http://artifacts.opnfv.org/compass4nfv/package/master/nova-novncproxy_xenial_newton.tar.gz
tar -zxvf nova-novncproxy_xenial_newton.tar.gz --strip-components 1 -C /var/cache/apt/
mkdir deb
diff --git a/repo/openstack/special_pkg/Debian/make_openvswitch-switch.sh b/repo/openstack/special_pkg/Debian/make_openvswitch-switch.sh
index 2095e0dc..1c43253b 100644
--- a/repo/openstack/special_pkg/Debian/make_openvswitch-switch.sh
+++ b/repo/openstack/special_pkg/Debian/make_openvswitch-switch.sh
@@ -21,7 +21,7 @@ apt-get install -y build-essential fakeroot debhelper \
pushd .
mkdir -p /home/package_yang/
cd /home/package_yang
-wget http://205.177.226.237:9999/onosfw/package_ovs_debian.tar.gz
+wget http://artifacts.opnfv.org/compass4nfv/package/master/onosfw/package_ovs_debian.tar.gz
tar -zxvf package_ovs_debian.tar.gz
#wget http://openvswitch.org/releases/openvswitch-2.3.1.tar.gz
#tar -zxvf openvswitch-2.3.1.tar.gz
diff --git a/repo/repo.conf b/repo/repo.conf
index 8fbdd060..b688b80c 100644
--- a/repo/repo.conf
+++ b/repo/repo.conf
@@ -12,12 +12,12 @@ TIMEOUT=100
#export MAKE_ALL=${MAKE_ALL:-"false"}
export JUMP_HOST="trusty"
# PACKAGE_URL will be reset in Jenkins for different branch
-export PACKAGE_URL=${PACKAGE_URL:-http://205.177.226.237:9999}
+export PACKAGE_URL=${PACKAGE_URL:-http://artifacts.opnfv.org/compass4nfv/package/master}
# feature packages
export KVMFORNFV=${kvmfornfv:-https://gerrit.opnfv.org/gerrit/p/kvmfornfv.git}
export ODL_PKG="$PACKAGE_URL/distribution-karaf-0.5.2-Boron.tar.gz"
-export JAVA_PKG="$PACKAGE_URL/jdk-8u51-linux-x64.tar.gz \
+export JAVA_PKG="http://download.oracle.com/otn/java/jdk/8u51-b16/jdk-8u51-linux-x64.tar.gz \
$PACKAGE_URL/install_jdk8.tar"
export ONOS_PKG="https://downloads.onosproject.org/release/onos-1.8.4.tar.gz \
$PACKAGE_URL/onosfw/networking-onos.tar \