x/daisycloud-core
Code Issues Proposed changes

daisy support ocata openstack deploy

Browse Source 
Change-Id: Ife8ada1720407c87119e404c8037298d8db480a0
This commit is contained in:
zhouya 2017-05-17 13:43:49 +08:00
parent 0b12168d5b
commit e25c44c81b
6 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/daisy/daisy/api/backends/kolla/config.py
View File

@ -37,7 +37,7 @@ _LW = i18n._LW
# generate kolla's ansible inventory multinode file # generate kolla's ansible inventory multinode file
def clean_inventory_file(file_path, filename): def clean_inventory_file(file_path, filename):
LOG.info(_("begin to clean inventory file for kolla")) 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() txt = fp.read()
fp.close() fp.close()
node_names = ['control', 'network', 'compute', 'monitoring', node_names = ['control', 'network', 'compute', 'monitoring',
@ -49,7 +49,8 @@ def clean_inventory_file(file_path, filename):
node_names[next_name_index+1]), node_names[next_name_index+1]),
txt, re.S) txt, re.S)
txt = txt.replace(match.group(1), '\n\n') 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.write(txt)
fp.close() fp.close()
@ -57,7 +58,7 @@ def clean_inventory_file(file_path, filename):
def update_inventory_file(file_path, filename, node_name, host_name, def update_inventory_file(file_path, filename, node_name, host_name,
num_of_host, connection_type): num_of_host, connection_type):
LOG.info(_("begin to update inventory file for kolla...")) 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 = [] lines = []
for line in fp: for line in fp:
lines.append(line) 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, lines.insert(index_of_label + num_of_host,
'%s\n' % host_name) '%s\n' % host_name)
s = ''.join(lines) 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.write(s)
fp.close() fp.close()

14
code/daisy/daisy/api/backends/kolla/install.py
View File

@ -181,7 +181,7 @@ def get_cluster_kolla_config(req, cluster_id):
openstack_version = kolla_openstack_version.split( openstack_version = kolla_openstack_version.split(
"= ")[1] "= ")[1]
if version_flag == False: 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 parent, dirnames, filenames in os.walk(version_path):
for filename in filenames: for filename in filenames:
if filename == 'all.yml': if filename == 'all.yml':
@ -570,8 +570,8 @@ class KOLLAInstallTask(Thread):
LOG.info(_("begin to kolla-ansible " LOG.info(_("begin to kolla-ansible "
"prechecks for all nodes...")) "prechecks for all nodes..."))
exc_result = subprocess.check_output( exc_result = subprocess.check_output(
'cd %s/kolla && ./tools/kolla-ansible prechecks -i ' 'cd %s/kolla-ansible && ./tools/kolla-ansible prechecks '
'%s/kolla/ansible/inventory/multinode' % ' -i %s/kolla-ansible/ansible/inventory/multinode' %
(self.kolla_file, self.kolla_file), (self.kolla_file, self.kolla_file),
shell=True, stderr=subprocess.STDOUT) shell=True, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
@ -589,8 +589,8 @@ class KOLLAInstallTask(Thread):
self.message, 20) self.message, 20)
LOG.info(_("kolla-ansible begin to deploy openstack ...")) LOG.info(_("kolla-ansible begin to deploy openstack ..."))
cmd = subprocess.Popen( cmd = subprocess.Popen(
'cd %s/kolla && ./tools/kolla-ansible deploy -i ' 'cd %s/kolla-ansible && ./tools/kolla-ansible deploy -i '
'%s/kolla/ansible/inventory/multinode' % '%s/kolla-ansible/ansible/inventory/multinode' %
(self.kolla_file, self.kolla_file), (self.kolla_file, self.kolla_file),
shell=True, stdout=fp, stderr=fp) shell=True, stdout=fp, stderr=fp)
self.message = "begin deploy openstack" self.message = "begin deploy openstack"
@ -623,8 +623,8 @@ class KOLLAInstallTask(Thread):
try: try:
LOG.info(_("kolla-ansible post-deploy for each node...")) LOG.info(_("kolla-ansible post-deploy for each node..."))
exc_result = subprocess.check_output( exc_result = subprocess.check_output(
'cd %s/kolla && ./tools/kolla-ansible post-deploy -i ' 'cd %s/kolla-ansible && ./tools/kolla-ansible post-deploy '
'%s/kolla/ansible/inventory/multinode' % ' -i %s/kolla-ansible/ansible/inventory/multinode' %
(self.kolla_file, self.kolla_file), (self.kolla_file, self.kolla_file),
shell=True, stderr=subprocess.STDOUT) shell=True, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:

4
code/daisy/daisy/api/backends/kolla/uninstall.py
View File

@ -191,9 +191,9 @@ class KOLLAUninstallTask(Thread):
try: try:
LOG.info(_("begin kolla-ansible destory")) LOG.info(_("begin kolla-ansible destory"))
exc_result = subprocess.Popen( exc_result = subprocess.Popen(
'cd %s/kolla && ./tools/kolla-ansible destroy ' 'cd %s/kolla-ansible && ./tools/kolla-ansible destroy '
'--include-images -i ' '--include-images -i '
'%s/kolla/ansible/inventory/multinode ' '%s/kolla-ansible/ansible/inventory/multinode '
'--yes-i-really-really-mean-it' % '--yes-i-really-really-mean-it' %
(self.kolla_file, self.kolla_file), (self.kolla_file, self.kolla_file),
shell=True, stdout=fp, stderr=fp) shell=True, stdout=fp, stderr=fp)

4
code/daisy/daisy/api/backends/kolla/upgrade.py
View File

@ -144,8 +144,8 @@ class KOLLAUpgradeTask(Thread):
LOG.info(_("begin to kolla-ansible " LOG.info(_("begin to kolla-ansible "
"upgrade for all nodes...")) "upgrade for all nodes..."))
exc_result = subprocess.check_output( exc_result = subprocess.check_output(
'cd %s/kolla && ./tools/kolla-ansible upgrade -i ' 'cd %s/kolla-ansible && ./tools/kolla-ansible upgrade -i '
'%s/kolla/ansible/inventory/multinode' % '%s/kolla-ansible/ansible/inventory/multinode' %
(self.kolla_file, self.kolla_file), (self.kolla_file, self.kolla_file),
shell=True, stderr=subprocess.STDOUT) shell=True, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:

4
tools/setup/common/daisy_yum.sh
View File

@ -36,8 +36,8 @@ function yum_set
make_yum_client make_yum_client
echo "creating epel yum repo, please wait for several seconds..." echo "creating epel yum repo, please wait for several seconds..."
yum install -y epel-release yum install -y epel-release
echo "creating openstack newton yum repo, please wait for several seconds..." echo "creating openstack yum repo, please wait for several seconds..."
yum install -y centos-release-openstack-newton yum install -y centos-release-openstack-ocata
} }
fi fi

21
tools/setup/install/install_func.sh
View File

@ -81,7 +81,7 @@ function kolla_install
check_and_install_rpm python2-crypto check_and_install_rpm python2-crypto
check_and_install_rpm python-gitdb check_and_install_rpm python-gitdb
check_and_install_rpm GitPython.noarch 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 python2-oslo-config.noarch
check_and_install_rpm python-six.noarch check_and_install_rpm python-six.noarch
check_and_install_rpm python-beautifulsoup4.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 yum install -y https://kojipkgs.fedoraproject.org//packages/python-jinja2/2.8/2.fc23/noarch/python-jinja2-2.8-2.fc23.noarch.rpm
fi fi
imagebranch="newton" imagebranch="ocata"
imageversion="latest" imageversion="170420124331"
imageserver="http://120.24.17.215" imageserver="http://120.24.17.215"
imagedir="/var/lib/daisy/versionfile/kolla" imagedir="/var/lib/daisy/versionfile/kolla"
imagebakdir="/home/kolla_install/docker/" imagebakdir="/home/kolla_install/docker/"
@ -119,18 +119,19 @@ function kolla_install
sourceversion=$(cat $imagedir/registry-*.version | head -1) sourceversion=$(cat $imagedir/registry-*.version | head -1)
write_install_log "Begin clone kolla... $sourceversion" write_install_log "Begin clone kolla... $sourceversion"
if [ -e "$sourcedir/kolla" ];then if [ -e "$sourcedir/kolla-anbible" ];then
echo "kolla code already exist!" echo "kolla-anbible code already exist!"
else else
mkdir -p $sourcedir mkdir -p $sourcedir
cd $sourcedir cd $sourcedir
git clone https://git.openstack.org/openstack/kolla git clone https://git.openstack.org/openstack/kolla-ansible
fi fi
cd $sourcedir/kolla cd $sourcedir/kolla-ansible
git remote update git remote update
git checkout -f $sourceversion #git checkout -f $sourceversion
cp -r /home/kolla_install/kolla/etc/kolla /etc #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 # TODO: (huzhj)Use latest registry server from upstream
if [ ! -f "$imagedir/registry-server.tar" ];then if [ ! -f "$imagedir/registry-server.tar" ];then
cd $imagebakdir cd $imagebakdir