diff --git a/backend/kolla/prepare.sh b/backend/kolla/prepare.sh index ad18ae2a..8ad11f61 100755 --- a/backend/kolla/prepare.sh +++ b/backend/kolla/prepare.sh @@ -30,7 +30,7 @@ echo -e "[Service]\nMountFlags=shared\nEnvironmentFile=/etc/sysconfig/docker\nEx systemctl daemon-reload systemctl restart docker systemctl enable docker -yum install -y python-docker-py +yum install -y python2-docker yum -y install ntp systemctl enable ntpd.service diff --git a/code/daisy/daisy/api/backends/kolla/config.py b/code/daisy/daisy/api/backends/kolla/config.py index 61abbfb1..dc58b2d8 100755 --- a/code/daisy/daisy/api/backends/kolla/config.py +++ b/code/daisy/daisy/api/backends/kolla/config.py @@ -236,7 +236,10 @@ def enable_neutron_backend(req, cluster_id, kolla_config): 'opendaylight_features': "odl-dlux-core,odl-dluxapps-applications," "odl-mdsal-apidocs,odl-netvirt-openstack", - 'opendaylight_restconf_port': "8087", + 'opendaylight_restconf_port': "8088", + 'opendaylight_restconf_port_backup': "8182", + 'opendaylight_haproxy_restconf_port': "8087", + 'opendaylight_haproxy_restconf_port_backup': "8181", 'opendaylight_leader_ip_address': ''} opendaylight_config['opendaylight_leader_ip_address'] =\ kolla_config['Odl_ips'].encode() diff --git a/doc/installation.md b/doc/installation.md index a955ac52..20c33636 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -1,8 +1,8 @@ ## Build Daisy artifact ``` -# cd tools -# ./daisy-compile-rpm.sh +# cd tools && ./daisy-compile-rpm.sh +(above run only once) # cd ../make # make allrpm ``` diff --git a/test/tempest/daisy_tempest/v1/test_cinder_volume.py b/test/tempest/daisy_tempest/v1/test_cinder_volume.py index 577fb1e2..62e1cfe1 100755 --- a/test/tempest/daisy_tempest/v1/test_cinder_volume.py +++ b/test/tempest/daisy_tempest/v1/test_cinder_volume.py @@ -174,10 +174,10 @@ class DaisyCinderVolumeTest(base.BaseDaisyTest): 'af47d81c-7ae4-4148-a801-b4a5c6a52074' self.assertRaisesMessage(client_exc.HTTPNotFound, - "404 Not Found\nThe resource could not be " - "found.\n Role with identifier " + "404 Not Found: The resource could not be " + "found.: Role with identifier " "af47d81c-7ae4-4148-a801-b4a5c6a52074 not " - "found (HTTP 404)", + "found (HTTP 404)", self.add_cinder_volume, **self.cinder_volume_add_meta) del self.cinder_volume_add_meta['role_id'] @@ -192,8 +192,8 @@ class DaisyCinderVolumeTest(base.BaseDaisyTest): 'test_driver' self.assertRaisesMessage(client_exc.HTTPBadRequest, - "400 Bad Request\nvolume_driver test_driver " - "is not supported\n (HTTP 400)", + "400 Bad Request: volume_driver test_driver " + "is not supported (HTTP 400)", self.add_cinder_volume, **self.cinder_volume_add_meta) del self.cinder_volume_add_meta['role_id'] @@ -261,8 +261,8 @@ class DaisyCinderVolumeTest(base.BaseDaisyTest): update_meta = {'volume_driver': 'test_driver'} self.assertRaisesMessage( client_exc.HTTPBadRequest, - "400 Bad Request\nvolume_driver test_driver is not supported\n" - " (HTTP 400)", + "400 Bad Request: volume_driver test_driver is not supported" + " (HTTP 400)", self.update_cinder_volume, cinder_volume_info.id, **update_meta) self.delete_cinder_volume(cinder_volume_info.id) diff --git a/test/tempest/daisy_tempest/v1/test_logical_network.py b/test/tempest/daisy_tempest/v1/test_logical_network.py index 57584ea2..c7c4443d 100755 --- a/test/tempest/daisy_tempest/v1/test_logical_network.py +++ b/test/tempest/daisy_tempest/v1/test_logical_network.py @@ -93,8 +93,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest): self.assertRaisesMessage( client_exc.HTTPBadRequest, - "400 Bad Request\n" - "Logic_network flat1 is not valid range.\n (HTTP 400)", + "400 Bad Request: " + "Logic_network flat1 is not valid range. (HTTP 400)", self.add_cluster, **fake_cluster) # STC-F-Daisy_Logical_Network-0002 @@ -145,8 +145,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest): 'routers': fake_router}) self.assertRaisesMessage( client_exc.HTTPBadRequest, - "400 Bad Request\nLogic network's subnets is all related " - "with a router, it's not allowed.\n (HTTP 400)", + "400 Bad Request: Logic network's subnets is all related " + "with a router, it's not allowed. (HTTP 400)", self.add_cluster, **fake_cluster) tmp_fake_router1 = copy.deepcopy(fake_router) @@ -154,8 +154,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest): fake_cluster.update({'routers': tmp_fake_router1}) self.assertRaisesMessage( client_exc.HTTPBadRequest, - "400 Bad Request\nLogic network's subnets is all related with a " - "router, it's not allowed.\n (HTTP 400)", + "400 Bad Request: Logic network's subnets is all related with a " + "router, it's not allowed. (HTTP 400)", self.add_cluster, **fake_cluster) tmp_fake_router2 = copy.deepcopy(fake_router) @@ -163,8 +163,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest): fake_cluster.update({'routers': tmp_fake_router2}) self.assertRaisesMessage( client_exc.HTTPBadRequest, - "400 Bad Request\n" - "Logic_network test is not valid range.\n (HTTP 400)", + "400 Bad Request: " + "Logic_network test is not valid range. (HTTP 400)", self.add_cluster, **fake_cluster) tmp_fake_router3 = copy.deepcopy(fake_router) @@ -172,7 +172,7 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest): fake_cluster.update({'routers': tmp_fake_router3}) self.assertRaisesMessage( client_exc.HTTPBadRequest, - "400 Bad Request\nSubnet test is not valid range.\n (HTTP 400)", + "400 Bad Request: Subnet test is not valid range. (HTTP 400)", self.add_cluster, **fake_cluster) self.private_network_delete() @@ -191,8 +191,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest): 'logic_networks': tmp_fake_logical1}) self.assertRaisesMessage( client_exc.HTTPBadRequest, - "400 Bad Request\n" - "Between floating ip range can not be overlap.\n (HTTP 400)", + "400 Bad Request: " + "Between floating ip range can not be overlap. (HTTP 400)", self.add_cluster, **fake_cluster) tmp_fake_logical2 = copy.deepcopy( @@ -205,8 +205,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest): fake_cluster.update({'logic_networks': tmp_fake_logical2}) self.assertRaisesMessage( client_exc.HTTPBadRequest, - "400 Bad Request\nSubnet name segment is repetition.\n " - "(HTTP 400)", + "400 Bad Request: Subnet name segment is repetition." + " (HTTP 400)", self.add_cluster, **fake_cluster) self.private_network_delete() diff --git a/tools/setup/common/daisy_yum.sh b/tools/setup/common/daisy_yum.sh index 18a0ab6d..553dde4f 100755 --- a/tools/setup/common/daisy_yum.sh +++ b/tools/setup/common/daisy_yum.sh @@ -37,7 +37,7 @@ function yum_set echo "creating epel yum repo, please wait for several seconds..." yum install -y epel-release echo "creating openstack yum repo, please wait for several seconds..." - yum install -y centos-release-openstack-ocata + yum install -y centos-release-openstack-pike } fi diff --git a/tools/setup/install/install_func.sh b/tools/setup/install/install_func.sh index a10121b1..639d3759 100755 --- a/tools/setup/install/install_func.sh +++ b/tools/setup/install/install_func.sh @@ -79,7 +79,7 @@ function kolla_install systemctl daemon-reload systemctl restart docker systemctl enable docker - check_and_install_rpm python-docker-py + check_and_install_rpm python2-docker check_and_install_rpm ntp systemctl enable ntpd.service systemctl start ntpd.service @@ -89,13 +89,13 @@ function kolla_install check_and_install_rpm GitPython.noarch check_and_install_rpm python2-pbr.noarch check_and_install_rpm python2-oslo-config.noarch - check_and_install_rpm python-six.noarch + check_and_install_rpm python2-six.noarch check_and_install_rpm python-beautifulsoup4.noarch check_and_install_rpm python2-setuptools.noarch - check_and_install_rpm python-jinja2 + check_and_install_rpm python2-jinja2 - imagebranch="ocata" - imageversion="170811155446" + imagebranch="pike" + imageversion="171031195331" imageserver="http://120.24.17.215" imagedir="/var/lib/daisy/versionfile/kolla" imagebakdir="/home/kolla_install/docker/"