diff --git a/code/daisy/daisy/api/backends/kolla/config.py b/code/daisy/daisy/api/backends/kolla/config.py index 8c1af48a..2099b622 100755 --- a/code/daisy/daisy/api/backends/kolla/config.py +++ b/code/daisy/daisy/api/backends/kolla/config.py @@ -37,7 +37,7 @@ _LW = i18n._LW # generate kolla's ansible inventory multinode file def clean_inventory_file(file_path, filename): LOG.info(_("begin to clean inventory file for kolla")) - fp = open('%s/kolla/ansible/inventory/%s' % (file_path, filename)) + fp = open('%s/kolla-ansible/ansible/inventory/%s' % (file_path, filename)) txt = fp.read() fp.close() node_names = ['control', 'network', 'compute', 'monitoring', @@ -49,7 +49,8 @@ def clean_inventory_file(file_path, filename): node_names[next_name_index+1]), txt, re.S) txt = txt.replace(match.group(1), '\n\n') - fp = file('%s/kolla/ansible/inventory/%s' % (file_path, filename), 'w') + fp = file('%s/kolla-ansible/ansible/inventory/%s' % ( + file_path, filename), 'w') fp.write(txt) fp.close() @@ -57,7 +58,7 @@ def clean_inventory_file(file_path, filename): def update_inventory_file(file_path, filename, node_name, host_name, num_of_host, connection_type): LOG.info(_("begin to update inventory file for kolla...")) - fp = file('%s/kolla/ansible/inventory/%s' % (file_path, filename)) + fp = file('%s/kolla-ansible/ansible/inventory/%s' % (file_path, filename)) lines = [] for line in fp: lines.append(line) @@ -66,7 +67,8 @@ def update_inventory_file(file_path, filename, node_name, host_name, lines.insert(index_of_label + num_of_host, '%s\n' % host_name) s = ''.join(lines) - fp = file('%s/kolla/ansible/inventory/%s' % (file_path, filename), 'w') + fp = file('%s/kolla-ansible/ansible/inventory/%s' % ( + file_path, filename), 'w') fp.write(s) fp.close() diff --git a/code/daisy/daisy/api/backends/kolla/install.py b/code/daisy/daisy/api/backends/kolla/install.py index c2a46991..d06681fc 100755 --- a/code/daisy/daisy/api/backends/kolla/install.py +++ b/code/daisy/daisy/api/backends/kolla/install.py @@ -181,7 +181,7 @@ def get_cluster_kolla_config(req, cluster_id): openstack_version = kolla_openstack_version.split( "= ")[1] if version_flag == False: - version_path = kolla_file + '/kolla/ansible/group_vars/' + version_path = kolla_file + '/kolla-ansible/ansible/group_vars/' for parent, dirnames, filenames in os.walk(version_path): for filename in filenames: if filename == 'all.yml': @@ -570,8 +570,8 @@ class KOLLAInstallTask(Thread): LOG.info(_("begin to kolla-ansible " "prechecks for all nodes...")) exc_result = subprocess.check_output( - 'cd %s/kolla && ./tools/kolla-ansible prechecks -i ' - '%s/kolla/ansible/inventory/multinode' % + 'cd %s/kolla-ansible && ./tools/kolla-ansible prechecks ' + ' -i %s/kolla-ansible/ansible/inventory/multinode' % (self.kolla_file, self.kolla_file), shell=True, stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: @@ -589,8 +589,8 @@ class KOLLAInstallTask(Thread): self.message, 20) LOG.info(_("kolla-ansible begin to deploy openstack ...")) cmd = subprocess.Popen( - 'cd %s/kolla && ./tools/kolla-ansible deploy -i ' - '%s/kolla/ansible/inventory/multinode' % + 'cd %s/kolla-ansible && ./tools/kolla-ansible deploy -i ' + '%s/kolla-ansible/ansible/inventory/multinode' % (self.kolla_file, self.kolla_file), shell=True, stdout=fp, stderr=fp) self.message = "begin deploy openstack" @@ -623,8 +623,8 @@ class KOLLAInstallTask(Thread): try: LOG.info(_("kolla-ansible post-deploy for each node...")) exc_result = subprocess.check_output( - 'cd %s/kolla && ./tools/kolla-ansible post-deploy -i ' - '%s/kolla/ansible/inventory/multinode' % + 'cd %s/kolla-ansible && ./tools/kolla-ansible post-deploy ' + ' -i %s/kolla-ansible/ansible/inventory/multinode' % (self.kolla_file, self.kolla_file), shell=True, stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: diff --git a/code/daisy/daisy/api/backends/kolla/uninstall.py b/code/daisy/daisy/api/backends/kolla/uninstall.py index ec128394..002cb326 100755 --- a/code/daisy/daisy/api/backends/kolla/uninstall.py +++ b/code/daisy/daisy/api/backends/kolla/uninstall.py @@ -191,9 +191,9 @@ class KOLLAUninstallTask(Thread): try: LOG.info(_("begin kolla-ansible destory")) exc_result = subprocess.Popen( - 'cd %s/kolla && ./tools/kolla-ansible destroy ' + 'cd %s/kolla-ansible && ./tools/kolla-ansible destroy ' '--include-images -i ' - '%s/kolla/ansible/inventory/multinode ' + '%s/kolla-ansible/ansible/inventory/multinode ' '--yes-i-really-really-mean-it' % (self.kolla_file, self.kolla_file), shell=True, stdout=fp, stderr=fp) diff --git a/code/daisy/daisy/api/backends/kolla/upgrade.py b/code/daisy/daisy/api/backends/kolla/upgrade.py index 8b060c44..656aa29d 100755 --- a/code/daisy/daisy/api/backends/kolla/upgrade.py +++ b/code/daisy/daisy/api/backends/kolla/upgrade.py @@ -144,8 +144,8 @@ class KOLLAUpgradeTask(Thread): LOG.info(_("begin to kolla-ansible " "upgrade for all nodes...")) exc_result = subprocess.check_output( - 'cd %s/kolla && ./tools/kolla-ansible upgrade -i ' - '%s/kolla/ansible/inventory/multinode' % + 'cd %s/kolla-ansible && ./tools/kolla-ansible upgrade -i ' + '%s/kolla-ansible/ansible/inventory/multinode' % (self.kolla_file, self.kolla_file), shell=True, stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: diff --git a/tools/setup/common/daisy_yum.sh b/tools/setup/common/daisy_yum.sh index 7700ef5f..18a0ab6d 100755 --- a/tools/setup/common/daisy_yum.sh +++ b/tools/setup/common/daisy_yum.sh @@ -36,8 +36,8 @@ function yum_set make_yum_client echo "creating epel yum repo, please wait for several seconds..." yum install -y epel-release - echo "creating openstack newton yum repo, please wait for several seconds..." - yum install -y centos-release-openstack-newton + echo "creating openstack yum repo, please wait for several seconds..." + yum install -y centos-release-openstack-ocata } fi diff --git a/tools/setup/install/install_func.sh b/tools/setup/install/install_func.sh index 893cc777..d22b83b6 100755 --- a/tools/setup/install/install_func.sh +++ b/tools/setup/install/install_func.sh @@ -81,7 +81,7 @@ function kolla_install check_and_install_rpm python2-crypto check_and_install_rpm python-gitdb check_and_install_rpm GitPython.noarch - check_and_install_rpm python-pbr.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 python-beautifulsoup4.noarch @@ -93,8 +93,8 @@ function kolla_install yum install -y https://kojipkgs.fedoraproject.org//packages/python-jinja2/2.8/2.fc23/noarch/python-jinja2-2.8-2.fc23.noarch.rpm fi - imagebranch="newton" - imageversion="latest" + imagebranch="ocata" + imageversion="170420124331" imageserver="http://120.24.17.215" imagedir="/var/lib/daisy/versionfile/kolla" imagebakdir="/home/kolla_install/docker/" @@ -119,18 +119,19 @@ function kolla_install sourceversion=$(cat $imagedir/registry-*.version | head -1) write_install_log "Begin clone kolla... $sourceversion" - if [ -e "$sourcedir/kolla" ];then - echo "kolla code already exist!" + if [ -e "$sourcedir/kolla-anbible" ];then + echo "kolla-anbible code already exist!" else mkdir -p $sourcedir cd $sourcedir - git clone https://git.openstack.org/openstack/kolla + git clone https://git.openstack.org/openstack/kolla-ansible fi - cd $sourcedir/kolla + cd $sourcedir/kolla-ansible git remote update - git checkout -f $sourceversion - cp -r /home/kolla_install/kolla/etc/kolla /etc - + #git checkout -f $sourceversion + #cp -r /home/kolla_install/kolla/etc/kolla /etc + git checkout -b stable/ocata remotes/origin/stable/ocata + cp -r /home/kolla_install/kolla-ansible/etc/kolla /etc # TODO: (huzhj)Use latest registry server from upstream if [ ! -f "$imagedir/registry-server.tar" ];then cd $imagebakdir