diff options
-rw-r--r-- | apex/build/build_utils.py | 7 | ||||
-rw-r--r-- | apex/deploy.py | 13 | ||||
-rw-r--r-- | build/Makefile | 2 | ||||
-rw-r--r-- | build/opnfv-environment.yaml | 1 | ||||
-rwxr-xr-x | build/overcloud-full.sh | 4 | ||||
-rwxr-xr-x | build/undercloud.sh | 3 | ||||
-rw-r--r-- | lib/ansible/playbooks/post_deploy_overcloud.yml | 6 |
7 files changed, 23 insertions, 13 deletions
diff --git a/apex/build/build_utils.py b/apex/build/build_utils.py index 14327a90..66a63d37 100644 --- a/apex/build/build_utils.py +++ b/apex/build/build_utils.py @@ -16,6 +16,8 @@ import re import shutil import sys +from urllib.parse import quote_plus + def clone_fork(args): ref = None @@ -35,7 +37,9 @@ def clone_fork(args): change_id = m.group(1) logging.info("Using change ID {} from {}".format(change_id, args.repo)) rest = GerritRestAPI(url=args.url) - change_str = "changes/{}?o=CURRENT_REVISION".format(change_id) + change_path = "{}~{}~{}".format(args.repo, quote_plus(args.branch), + change_id) + change_str = "changes/{}?o=CURRENT_REVISION".format(change_path) change = rest.get(change_str) try: assert change['status'] not in 'ABANDONED' 'CLOSED',\ @@ -104,5 +108,6 @@ def main(): parser.print_help() exit(1) + if __name__ == "__main__": main() diff --git a/apex/deploy.py b/apex/deploy.py index 37429773..a0561384 100644 --- a/apex/deploy.py +++ b/apex/deploy.py @@ -280,10 +280,8 @@ def main(): ansible_args = { 'virsh_enabled_networks': net_settings.enabled_network_list } - ansible_path = os.path.join(args.lib_dir, ANSIBLE_PATH) utils.run_ansible(ansible_args, - os.path.join(args.lib_dir, - ansible_path, + os.path.join(args.lib_dir, ANSIBLE_PATH, 'deploy_dependencies.yml')) uc_external = False if 'external' in net_settings.enabled_network_list: @@ -328,8 +326,7 @@ def main(): args.deploy_dir, APEX_TEMP_DIR) # Install Undercloud undercloud.configure(net_settings, - os.path.join(args.lib_dir, - ansible_path, + os.path.join(args.lib_dir, ANSIBLE_PATH, 'configure_undercloud.yml'), APEX_TEMP_DIR) @@ -344,7 +341,7 @@ def main(): overcloud_deploy.create_deploy_cmd(deploy_settings, net_settings, inventory, APEX_TEMP_DIR, args.virtual, args.env_file) - deploy_playbook = os.path.join(args.lib_dir, ansible_path, + deploy_playbook = os.path.join(args.lib_dir, ANSIBLE_PATH, 'deploy_overcloud.yml') virt_env = 'virtual-environment.yaml' bm_env = 'baremetal-environment.yaml' @@ -415,7 +412,7 @@ def main(): deploy_vars['external_network_ipv6'] = True else: deploy_vars['external_network_ipv6'] = False - post_undercloud = os.path.join(args.lib_dir, ansible_path, + post_undercloud = os.path.join(args.lib_dir, ANSIBLE_PATH, 'post_deploy_undercloud.yml') logging.info("Executing post deploy configuration undercloud playbook") try: @@ -432,7 +429,7 @@ def main(): deploy_vars['vpn'] = ds_opts['vpn'] # TODO(trozet): pull all logs and store in tmp dir in overcloud # playbook - post_overcloud = os.path.join(args.lib_dir, ansible_path, + post_overcloud = os.path.join(args.lib_dir, ANSIBLE_PATH, 'post_deploy_overcloud.yml') # Run per overcloud node for node, ip in deploy_vars['overcloud_nodes'].items(): diff --git a/build/Makefile b/build/Makefile index ae6fbf85..44e92a8a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -275,7 +275,7 @@ iso: iso-clean images rpms $(CENTISO) cd $(BUILD_DIR)/centos/Packages && yumdownloader python34-jinja2 python34-markupsafe ansible python34-six python34-cffi cd $(BUILD_DIR)/centos/Packages && yumdownloader ipxe-roms-qemu python34-idna python34-pycparser python-crypto python-httplib2 cd $(BUILD_DIR)/centos/Packages && yumdownloader python-jinja2 python-keyczar python-paramiko sshpass python-ecdsa python34-ply - cd $(BUILD_DIR)/centos/Packages && yumdownloader libvirt-client libvirt-python python-lxml + cd $(BUILD_DIR)/centos/Packages && yumdownloader libvirt-client libvirt-python python-lxml python-passlib cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-asn1crypto-0.22.0-1.el7.centos.noarch.rpm cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python34-cryptography-2.0.3-1.el7.centos.x86_64.rpm diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 5b5d4500..7da252ec 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -132,6 +132,7 @@ parameter_defaults: - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::OVNDBs - OS::TripleO::Services::Vpp + - OS::TripleO::Services::NeutronBgpvpnApi ComputeServices: - OS::TripleO::Services::Barometer - OS::TripleO::Services::CACerts diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 6fdc32d6..06e461f7 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -25,13 +25,13 @@ mv -f ${BUILD_DIR}/overcloud-full.qcow2 ${BUILD_DIR}/overcloud-full_build.qcow2 pushd ${BUILD_DIR} > /dev/null # prep opnfv-puppet-tripleo for undercloud -python3 -B $BUILD_UTILS clone-fork -r apex-puppet-tripleo +python3 -B $BUILD_UTILS clone-fork -r apex-puppet-tripleo -b stable/euphrates pushd apex-puppet-tripleo > /dev/null git archive --format=tar.gz --prefix=tripleo/ HEAD > ${BUILD_DIR}/apex-puppet-tripleo.tar.gz popd > /dev/null # download customized os-net-config -python3 -B $BUILD_UTILS clone-fork -r apex-os-net-config +python3 -B $BUILD_UTILS clone-fork -r apex-os-net-config -b stable/euphrates pushd apex-os-net-config/os_net_config > /dev/null git archive --format=tar.gz --prefix=os_net_config/ HEAD > ${BUILD_DIR}/apex-os-net-config.tar.gz popd > /dev/null diff --git a/build/undercloud.sh b/build/undercloud.sh index 05cbf552..5930c503 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -18,7 +18,7 @@ cp -f ${CACHE_DIR}/undercloud.qcow2 ${BUILD_DIR}/undercloud_build.qcow2 pushd ${BUILD_DIR} > /dev/null # prep apex-tht for undercloud -python3 -B $BUILD_UTILS clone-fork -r apex-tripleo-heat-templates +python3 -B $BUILD_UTILS clone-fork -r apex-tripleo-heat-templates -b stable/euphrates pushd apex-tripleo-heat-templates > /dev/null git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz popd > /dev/null @@ -53,6 +53,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_ROOT}/baremetal-environment.yaml:/home/stack/ \ --uninstall "libvirt-client" \ --install "libguestfs-tools" \ + --install "python-tackerclient" \ -a undercloud_build.qcow2 mv -f undercloud_build.qcow2 undercloud.qcow2 diff --git a/lib/ansible/playbooks/post_deploy_overcloud.yml b/lib/ansible/playbooks/post_deploy_overcloud.yml index fdf70240..5af138d2 100644 --- a/lib/ansible/playbooks/post_deploy_overcloud.yml +++ b/lib/ansible/playbooks/post_deploy_overcloud.yml @@ -43,3 +43,9 @@ fetch: src: /var/log/messages dest: "{{ apex_temp_dir }}" + - name: Tacker Fernet Keys Directory + file: + path: /etc/tacker/vim/fernet_keys + state: directory + mode: 0755 + become: yes |