Commit Graph

119 Commits

Author SHA1 Message Date
Zhijiang Hu 07023bdb8d Clean yum cache after adding each repo
Change-Id: Ie839cd8b358ebc87bbe91c3c0ee039dca6161505
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-04-13 10:01:32 +08:00
Zhijiang Hu 01e225339b update ODL to Nitrogen
Change-Id: I5b4ecfd5668b3c5ffdb00146393b669289eb5d78
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-04-10 16:37:58 +08:00
Zhijiang Hu f6c54891ea Install mod_wsgi explicitly
Change-Id: Ib34cd32eb76cff55a22f27401938c184dc0116ec
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-04-03 21:03:08 +08:00
Zhijiang Hu e0b52225ba Install httpd explicitly
Change-Id: Ie9c4de077ae5dc5d3435937bcd850f62a13d90e0
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-04-03 09:31:31 +08:00
Zhijiang Hu c490b9ec1b Upgrade to OpenStack Queens
This PS does:
1) Build and run Daisycloud-core in queens env
2) Upgrade image verison to Queens
3) Remove UI out from daisycloud-core

Change-Id: Iecdce8bf73001a7930c2f90cb814e4bfcbaae7c4
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-04-02 17:32:52 +08:00
Zhijiang Hu 2c63adb20a docker load latest registry server during runtime
Change-Id: I12c336890a3edc2ed53397e935a33b81925db521
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-03-19 11:00:05 +08:00
Zhijiang Hu 1ddb58f2f5 fix and store docker engine rpm at build time
Change-Id: I4a07ac98f62de0efab62ec067891285f2325e636
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-03-09 17:06:33 +08:00
Zhijiang Hu 3ae6dee610 Update image to include patch for NETVIRT-896
Change-Id: I96cc741cf80f274a9e46864a0a1873a177e96775
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-01-24 03:34:43 -05:00
wangqiangbj 8022dd9b37 fix misspelling of 'configuration'
Change-Id: Ibf20bf78a521936e357a65e2aee15b7dbc2e693e
2018-01-17 11:38:53 +08:00
Zhijiang Hu d4bde49c62 update image for ODL
Change-Id: Ieba61dfd85f814fa886c14b0906fc98cf15628c1
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-01-13 16:11:45 +08:00
Zhijiang Hu 7bd83aa4aa Show image name while downloading it
Change-Id: I977695719d824308dd1c869ced6e91bd1179947c
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-01-10 22:01:25 -05:00
Zhijiang Hu d55ec7e353 update image
Change-Id: I9fa9f4b95f9776c38fcf62de794e7bb1eeb41ef5
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-01-10 07:21:13 -05:00
Zhijiang Hu f4f20017d7 update image
Change-Id: I399ad39a7178938af431fcbd14497aa95e6c5e46
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-12-27 17:27:03 -05:00
Zhijiang Hu 4389161c13 Update kolla image
Change-Id: I4bb02884c10300b85a0cdca0b9b459a11ca8ff81
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-25 22:06:15 +08:00
Zhijiang Hu 4becb4f4ea Switch ODL version to Carbon-SR1
SR2 has issues with FIP ping test?

Change-Id: I177ea94af40dec493e09d08eb1f81578f2de9042
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-22 04:40:32 -05:00
Zhijiang Hu 44de879794 Update image to solve kolla-box missing packaget
Change-Id: I645164280dfb9916c5baa49b4c7b10a0d787011c
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-17 02:11:05 -05:00
Zhijiang Hu 7e546ff90c Switch ceilometer backend from mongodb to gnocchi
This PS also update required image to a image which
includes gnocchi.

Change-Id: I5b6343d6e8b4cd170e6616521040330b3283b434
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-16 06:18:05 -05:00
Zhijiang Hu 18034dca40 yum install -y ansible-2.4.0
Change-Id: I0ec889d5c1f2e8c59a766d6f1268af2a8e08bad8
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-15 21:53:14 -05:00
Zhijiang Hu 4a5a9da5cf Fix rpm installation failure
Change-Id: I35759d44ca6a7283bb9d3c95646dec2934369eec
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-15 23:59:22 +08:00
Zhijiang Hu 217dc335c9 add sshpass to daisy's requirment
Change-Id: Ibd078ae03db69c1f34d32e9ba96978f97c84b040
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-15 19:26:14 +08:00
Zhijiang Hu 0ce7000e58 all-in-one deploy bugfixes
1. kill ODL leader IP since we are now deploying ODL cluster.
2. Inventory file update bugfix
3. Fix ansible version to 2.4.0

Change-Id: I06aa442dd935ef1ea2225d06c89bf07351744793
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-15 15:13:01 +08:00
Zhijiang Hu de21a7e3f2 Switch kolla image download URL to OPNFV GS
Change-Id: I206d51ea83c47a89a2e57d729ec9590031ec8285
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-07 23:47:20 -05:00
Zhijiang Hu 3b19059841 test build and run daisy on pike env
Change-Id: Id2e2bc776751f9d4d4952ba641a10540f903409c
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-11-02 06:28:54 -04:00
zhouya cbf13e8413 add aodh-client and ceilometer-client to enable get data from daisy server
Change-Id: I6ff36b74afb2b9cd4909e9cdcc2a78b7f3349d87
2017-09-22 10:13:05 +08:00
Zhijiang Hu 19af5971f6 Use python-jinja2 from centos-openstack-ocata
python-jinja2 in centos-openstack-ocata now is 2.8.1 and can replace
the old one.

Change-Id: Id0e6fc46169d37e9570d35da1c890875d1342e19
2017-09-11 05:44:32 -04:00
Zhijiang Hu b6533f7e06 Revert "Change docker-engine download url"
This reverts commit b39cf502dc.

Change-Id: I50758460ad88c4d3726c3722d9a38ef7e3a6cfba
2017-09-10 00:26:00 +00:00
Zhijiang Hu 86af78213c Solve version upgrade errors
1. Solve Docker service not start after restart.
2. Solve a variable not exist error in upgrade thread code.
3. Consider update global.yml before calling kolla-ansible
upgrade to aware of changing of multicast switch in daisy.conf.

Change-Id: I9cddb4614264689d5fe1858249875f950c41a699
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-28 07:01:26 -04:00
Zhijiang Hu b39cf502dc Change docker-engine download url
dockerproject.org is slow sometimes lose connection in China.

Change-Id: I73cc6cc36dd6ec674b29b704a6db6d79cf76f981
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-23 05:22:36 -04:00
Zhijiang Hu 026709bce6 Deal with new flake8 error
Change-Id: I2d0f2c289a30ca7417b28f91b86958977128d944
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-22 04:40:24 -04:00
Zhijiang Hu dd58ce348f Test installing docker-engine result
yum.dockerproject.org is slow in China, Daisy should be
more sensitive to errors occured when using that URL.

Change-Id: I4484a1090f0ad9a88b8c9a5bb948a32d9d0e0101
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-21 10:40:20 +00:00
zhouya 3c2f44e222 use carbon opendaylight version to replace snapshot version
Change-Id: I45694a3bb4e2e23f3de7af3106476c4dece89eb6
2017-08-15 20:16:16 +08:00
zhouya 39508100bc fix pxe server cannot build by daisy.conf bug
when use daisy.conf to deploy the pxe server:
get "instal_func.sh: line 39: bc: command not found" error
the env is lack of bc package

Change-Id: I8d23f7755cde86fee39b6717f13dc1146303bfc8
2017-08-07 17:29:01 +08:00
Zhijiang Hu f142635636 Rename jasmine to daisy4nfv-jasmine
Change-Id: I973de329009cf9e5d3d690d6429c923252f26a7e
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-04 18:54:57 +08:00
Zhijiang Hu 49b9707895 Rename ironic-discoverd to daisy-discoverd
Historically, Daisy's discoverd is a fork from ironic-discoverd
without changing package name. This has problems:
1) When user want to install daisy but there is already a
ironic-discoverd which from OpenStack, then daisy's discoverd
will not be installed due to already existed.
2) When user already installed Daisy's discoverd and later do
yum update, then daisy's discoverd will be replaced by
ironic-discoverd which from OpenStack.

Both scenarios above will results in Daisy does not work. So
This PS changes ironic-discoverd to daisy-discoverd.

Change-Id: Ic505feb12271dd87e5781da28f79ca604d49374e
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-04 17:41:40 +08:00
root 1dea7658e8 add HEARTBEAT plane to seperate the api and keeplived interface
Change-Id: I61cc751f7133f257d897a559b6c536f419940e2e
2017-07-06 09:47:16 +08:00
root a5f11cf3a0 fix the docker version to 17.05
Change-Id: I25983c6f56c3b2007482732c3ae8671847b3d47c
2017-06-29 12:36:25 +00:00
Zhijiang Hu b1dca214f3 Start daisy service after creating daisy DB
Change-Id: I9ff7d1d88fc66154da35f2ca716d14da0004c060
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-27 09:09:24 +00:00
root 8c8ce35ee4 support opendaylight scenario
Change-Id: Id764c42ff9ff4bd81457f97f306251c5ad96ec8c
2017-06-26 16:44:59 +08:00
zhouya cd574b28e6 use temporary registry of kolla-ansible to support opendaylight
Change-Id: I1191ff620100d5fddf52716f478fb576040150e5
2017-06-03 09:44:22 +08:00
zhouya e25c44c81b daisy support ocata openstack deploy
Change-Id: Ife8ada1720407c87119e404c8037298d8db480a0
2017-05-22 16:01:36 +08:00
Zhijiang Hu 0b12168d5b No need to touch RPM DB
Change-Id: I8e850e705f9b0b96f80e9e91709628e3d9ef1302
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-05-21 22:36:29 -04:00
zhouya df0679ee00 delete registry docker repo on target node
this action executes after uninstalling openstack

Change-Id: Ie4264bf671968e239643554d9e4d96a461cec811
2017-05-11 10:08:20 +08:00
zhouya 27fb288f11 fix bug of read from conf file is str instead of flag
1.fix bug of get config from conf file is a str
2.modify daisy default backend as kolla
3.modify daisy max os install num to 20

Change-Id: I9ebb0e9ec4ff100ec723544d10a15aebe78585f2
2017-04-28 15:10:19 +08:00
zhouya ce89ddb010 fix bug of daisy uninstall openstack
Change-Id: I614fec7760d740fd4df8b16df2743f275d3b3714
2017-04-27 08:59:47 +08:00
zhouya c086326f15 fix bug of multicast
Change-Id: Ide8ca343ae88d8be1f74f69d3b5fd1a4e89024c6
2017-04-25 15:38:09 +08:00
Zhijiang Hu f70d46946a Add installation of epel-release
clustershell is provided by epel-release, so we need to install
epel-release before installing clustershell.

Change-Id: Ide471d6b3501ea39d561f599c5a87ac487c41392
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-21 05:36:34 -04:00
Zhijiang Hu 314b0c5570 WIP: Enable multicast
1. When install daisy, save registry-serve.tar into
/var/lib/daisy/tools just like jasmine.rpm

2. During preparation stage, scp registry-serve.tar and jasmine.rpm
to all targets, and install them on the target hosts.

3. Add version_load_mcast() to use jasmines/jasminec to multicast
kolla image, and build registry server on each target hosts.

4. (TODO)
If version_load_mcast() failed (may due to mcast not allowed by
config or mcast failed on server or any client), config kolla to let
it to fallback to use remote docker image registry. If
version_load_mcast() successful, then config kolla to use
127.0.0.1 as docker registyr server IP.

Change-Id: I69cda8c0c259c356459770f4cb2b6f46da868893
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-18 10:38:00 +08:00
Alex Yang a25f94f658 path error in docker loading registry-server.tgz
Current directory is $sourcedir/kolla.
So the absolute path should be used.

Change-Id: I77aa46d9085ebaf9573cdd8bd71f848f70c3d4e3
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-04-18 09:50:24 +08:00
Zhijiang Hu 6bac9c52a4 Add jasmine to daisy.bin
Change-Id: Ife96b02358f3fcb822d7d750a5f6696c7f52320d
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-10 07:11:57 -04:00
Yao Lu 5ce1b754a3 patch of 446820 avoid repeat get registry image
Change-Id: I218e835376b25ab8c2e4702cf827351a52028fd2
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
2017-04-01 03:26:26 +00:00