diff options
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 6 | ||||
| -rwxr-xr-x | xci/config/user-vars | 6 | ||||
| -rwxr-xr-x | xci/installer/kubespray/deploy.sh | 8 | ||||
| -rwxr-xr-x | xci/installer/osa/deploy.sh | 14 | ||||
| -rw-r--r-- | xci/installer/osa/files/ansible-role-requirements.yml | 80 | ||||
| -rw-r--r-- | xci/installer/osa/files/openstack_services.yml | 78 | ||||
| -rwxr-xr-x | xci/scripts/update-osa-version-files.sh | 4 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 6 |
8 files changed, 103 insertions, 99 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index 726a4da4..67d5e2d8 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -21,7 +21,7 @@ BUILD_IMAGE=true PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600} # This is normally exported by XCI env but we should initialize it here # in case we run this script on its own for debug purposes -XCI_ANSIBLE_VERBOSITY=${XCI_ANSIBLE_VERBOSITY:-} +XCI_ANSIBLE_PARAMS=${XCI_ANSIBLE_PARAMS:-} # Ironic SHAs BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-master} BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-master} @@ -132,7 +132,7 @@ if [[ -e /etc/centos-release ]]; then fi # Create the VMS -${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ +${ANSIBLE} ${XCI_ANSIBLE_PARAMS} \ -i inventory/localhost \ test-bifrost-create-vm.yaml \ -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \ @@ -143,7 +143,7 @@ ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ -e ${INVENTORY_FILE_FORMAT}=${BAREMETAL_DATA_FILE} # Execute the installation and VM startup test -${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ +${ANSIBLE} ${XCI_ANSIBLE_PARAMS} \ -i inventory/bifrost_inventory.py \ ${TEST_PLAYBOOK} \ -e use_cirros=${USE_CIRROS} \ diff --git a/xci/config/user-vars b/xci/config/user-vars index fadf7ccc..c3b11e8e 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -40,10 +40,8 @@ export INSTALLER_TYPE=${INSTALLER_TYPE:-osa} # Set the verbosity for ansible # # Examples: -# XCI_ANSIBLE_VERBOSITY="-v" -# or -# XCI_ANSIBLE_VERBOSITY="-vvvv" -export XCI_ANSIBLE_VERBOSITY=${XCI_ANSIBLE_VERBOSITY:-""} +# XCI_ANSIBLE_PARAMS="-v -e foo=bar" +export XCI_ANSIBLE_PARAMS=${XCI_ANSIBLE_PARAMS:-""} export RUN_TEMPEST=${RUN_TEMPEST:-false} export CORE_OPENSTACK_INSTALL=${CORE_OPENSTACK_INSTALL:-false} export BIFROST_USE_PREBUILT_IMAGES=${BIFROST_USE_PREBUILT_IMAGES:-false} diff --git a/xci/installer/kubespray/deploy.sh b/xci/installer/kubespray/deploy.sh index b04ed781..548ed771 100755 --- a/xci/installer/kubespray/deploy.sh +++ b/xci/installer/kubespray/deploy.sh @@ -25,7 +25,7 @@ export ANSIBLE_ROLES_PATH=$HOME/.ansible/roles:/etc/ansible/roles:${XCI_PATH}/xc echo "Info: Configuring localhost for kubespray" echo "-----------------------------------------------------------------------" cd $XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -e XCI_PATH="${XCI_PATH}" \ +ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" \ -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory/inventory.cfg \ configure-localhost.yml echo "-----------------------------------------------------------------------" @@ -44,7 +44,7 @@ echo "Info: Configured localhost for kubespray" echo "Info: Configuring opnfv deployment host for kubespray" echo "-----------------------------------------------------------------------" cd $K8_XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -e XCI_PATH="${XCI_PATH}" \ +ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" \ -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory/inventory.cfg \ configure-opnfvhost.yml echo "-----------------------------------------------------------------------" @@ -63,7 +63,7 @@ if [ $XCI_FLAVOR != "aio" ]; then echo "Info: Configuring target hosts for kubespray" echo "-----------------------------------------------------------------------" cd $K8_XCI_PLAYBOOKS - ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -e XCI_PATH="${XCI_PATH}" \ + ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" \ -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory/inventory.cfg \ configure-targethosts.yml echo "-----------------------------------------------------------------------" @@ -73,7 +73,7 @@ fi echo "Info: Using kubespray to deploy the kubernetes cluster" echo "-----------------------------------------------------------------------" ssh root@$OPNFV_HOST_IP "cd releng-xci/.cache/repos/kubespray;\ - ansible-playbook ${XCI_ANSIBLE_VERBOSITY} \ + ansible-playbook ${XCI_ANSIBLE_PARAMS} \ -i opnfv_inventory/inventory.cfg cluster.yml -b | tee setup-kubernetes.log" scp root@$OPNFV_HOST_IP:~/releng-xci/.cache/repos/kubespray/setup-kubernetes.log \ $LOG_PATH/setup-kubernetes.log diff --git a/xci/installer/osa/deploy.sh b/xci/installer/osa/deploy.sh index 1e442918..6702b678 100755 --- a/xci/installer/osa/deploy.sh +++ b/xci/installer/osa/deploy.sh @@ -39,7 +39,7 @@ fi echo "Info: Configuring localhost for openstack-ansible" echo "-----------------------------------------------------------------------" cd $XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -e XCI_PATH="${XCI_PATH}" -i inventory configure-localhost.yml +ansible-playbook ${XCI_ANSIBLE_PARAMS} -i "localhost," configure-localhost.yml echo "-----------------------------------------------------------------------" echo "Info: Configured localhost host for openstack-ansible" @@ -57,7 +57,7 @@ echo "Info: Configured localhost host for openstack-ansible" echo "Info: Configuring opnfv deployment host for openstack-ansible" echo "-----------------------------------------------------------------------" cd $OSA_XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -e XCI_PATH="${XCI_PATH}" -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \ +ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \ configure-opnfvhost.yml echo "-----------------------------------------------------------------------" echo "Info: Configured opnfv deployment host for openstack-ansible" @@ -77,7 +77,7 @@ if [[ $XCI_FLAVOR != "aio" ]]; then echo "Info: Configuring target hosts for openstack-ansible" echo "-----------------------------------------------------------------------" cd $OSA_XCI_PLAYBOOKS - ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -e XCI_PATH="${XCI_PATH}" -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \ + ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \ configure-targethosts.yml echo "-----------------------------------------------------------------------" echo "Info: Configured target hosts" @@ -90,7 +90,7 @@ fi #------------------------------------------------------------------------------- echo "Info: Setting up target hosts for openstack-ansible" echo "-----------------------------------------------------------------------" -ssh root@$OPNFV_HOST_IP "set -o pipefail; openstack-ansible ${XCI_ANSIBLE_VERBOSITY} \ +ssh root@$OPNFV_HOST_IP "set -o pipefail; openstack-ansible ${XCI_ANSIBLE_PARAMS} \ releng-xci/.cache/repos/openstack-ansible/playbooks/setup-hosts.yml | tee setup-hosts.log " scp root@$OPNFV_HOST_IP:~/setup-hosts.log $LOG_PATH/setup-hosts.log echo "-----------------------------------------------------------------------" @@ -112,7 +112,7 @@ echo "Info: Set up target hosts for openstack-ansible successfuly" echo "Info: Gathering facts" echo "-----------------------------------------------------------------------" ssh root@$OPNFV_HOST_IP "set -o pipefail; cd releng-xci/.cache/repos/openstack-ansible/playbooks; \ - ansible ${XCI_ANSIBLE_VERBOSITY} -m setup -a gather_subset=network,hardware,virtual all" + ansible ${XCI_ANSIBLE_PARAMS} -m setup -a gather_subset=network,hardware,virtual all" echo "-----------------------------------------------------------------------" #------------------------------------------------------------------------------- @@ -123,7 +123,7 @@ echo "-----------------------------------------------------------------------" echo "Info: Setting up infrastructure" echo "-----------------------------------------------------------------------" echo "xci: running ansible playbook setup-infrastructure.yml" -ssh root@$OPNFV_HOST_IP "set -o pipefail; openstack-ansible ${XCI_ANSIBLE_VERBOSITY} \ +ssh root@$OPNFV_HOST_IP "set -o pipefail; openstack-ansible ${XCI_ANSIBLE_PARAMS} \ releng-xci/.cache/repos/openstack-ansible/playbooks/setup-infrastructure.yml | tee setup-infrastructure.log" scp root@$OPNFV_HOST_IP:~/setup-infrastructure.log $LOG_PATH/setup-infrastructure.log echo "-----------------------------------------------------------------------" @@ -157,7 +157,7 @@ echo "Info: Database cluster verification successful!" #------------------------------------------------------------------------------- echo "Info: Installing OpenStack on target hosts" echo "-----------------------------------------------------------------------" -ssh root@$OPNFV_HOST_IP "set -o pipefail; openstack-ansible ${XCI_ANSIBLE_VERBOSITY} \ +ssh root@$OPNFV_HOST_IP "set -o pipefail; openstack-ansible ${XCI_ANSIBLE_PARAMS} \ releng-xci/.cache/repos/openstack-ansible/playbooks/setup-openstack.yml | tee opnfv-setup-openstack.log" scp root@$OPNFV_HOST_IP:~/opnfv-setup-openstack.log $LOG_PATH/opnfv-setup-openstack.log echo "-----------------------------------------------------------------------" diff --git a/xci/installer/osa/files/ansible-role-requirements.yml b/xci/installer/osa/files/ansible-role-requirements.yml index 7f22797f..5e25c02c 100644 --- a/xci/installer/osa/files/ansible-role-requirements.yml +++ b/xci/installer/osa/files/ansible-role-requirements.yml @@ -11,31 +11,31 @@ # http://git.openstack.org/cgit/openstack/openstack-ansible/commit/?id=eee0498dbe21fea565c06c686546c0734c4bb2e3 - name: ansible-hardening scm: git - src: https://git.openstack.org/openstack/ansible-hardening + src: https://github.com/openstack/ansible-hardening version: 0635fb840aafc914f2ffdfedc4548dc1abb37c7a - name: apt_package_pinning scm: git - src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning + src: https://github.com/openstack/openstack-ansible-apt_package_pinning version: af87185d6d9a2ed066db85a9e6e2bec4d047089b - name: pip_install scm: git - src: https://git.openstack.org/openstack/openstack-ansible-pip_install + src: https://github.com/openstack/openstack-ansible-pip_install version: faf690dffb820104c9ad707fe11ca646b7b78098 - name: galera_client scm: git - src: https://git.openstack.org/openstack/openstack-ansible-galera_client + src: https://github.com/openstack/openstack-ansible-galera_client version: ccafe5e816694907869c6591b5121fc59074934c - name: galera_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-galera_server + src: https://github.com/openstack/openstack-ansible-galera_server version: dfb3d59dfb87eedb84a3e7b0bafb3764dd8a2cfa - name: ceph_client scm: git - src: https://git.openstack.org/openstack/openstack-ansible-ceph_client + src: https://github.com/openstack/openstack-ansible-ceph_client version: ab68c5e925e086c91b1ad4064cb406cc736bdb23 - name: haproxy_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server + src: https://github.com/openstack/openstack-ansible-haproxy_server version: 212e9bd262ee8fb9c635597516d56879ac817c7c - name: keepalived scm: git @@ -43,135 +43,135 @@ version: 2b4a1f36c29b06b832bc4e6d112ca5559a98fd4a - name: lxc_container_create scm: git - src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create + src: https://github.com/openstack/openstack-ansible-lxc_container_create version: 87353ebc316286b1f883124c45860a021e518889 - name: lxc_hosts scm: git - src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts + src: https://github.com/openstack/openstack-ansible-lxc_hosts version: 0c6d6c89acda8db63d93e6514359a03e782089aa - name: memcached_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-memcached_server + src: https://github.com/openstack/openstack-ansible-memcached_server version: 0e526d63e68c9318dbe249ffcb355672c401268a - name: openstack_hosts scm: git - src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts + src: https://github.com/openstack/openstack-ansible-openstack_hosts version: 3e64936b228593d3dd59bf3b3203023b4c6e554c - name: os_keystone scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_keystone + src: https://github.com/openstack/openstack-ansible-os_keystone version: 17f702aa093579e61b482c7496e2a1f056819483 - name: openstack_openrc scm: git - src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc + src: https://github.com/openstack/openstack-ansible-openstack_openrc version: 735e066ba19caebb9299aaab163f5082d2b04bd4 - name: os_aodh scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_aodh + src: https://github.com/openstack/openstack-ansible-os_aodh version: 492ff856886ab096329dee337728e7c88482e9f9 - name: os_barbican scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_barbican + src: https://github.com/openstack/openstack-ansible-os_barbican version: bb2b7264292e7a957c66b95ac412a94c0d8e407d - name: os_ceilometer scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer + src: https://github.com/openstack/openstack-ansible-os_ceilometer version: 0b88342fa352f2bc048104f66c9476f465d1d23d - name: os_cinder scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_cinder + src: https://github.com/openstack/openstack-ansible-os_cinder version: 782c27cf60aa57cc2168ca51b6a8a7f2b43acfc6 - name: os_designate scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_designate + src: https://github.com/openstack/openstack-ansible-os_designate version: e9c1d198a4dcb645f7c1f3cff22e98dab180315a - name: os_glance scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_glance + src: https://github.com/openstack/openstack-ansible-os_glance version: 6c5c8d3d915f506a60b89251bd5caaba3b383ef0 - name: os_gnocchi scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi + src: https://github.com/openstack/openstack-ansible-os_gnocchi version: 4891d9bdfb4569f3097373f2fb2e677795663a52 - name: os_heat scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_heat + src: https://github.com/openstack/openstack-ansible-os_heat version: dda5325225213c095c7c5697f30df8c41bcd9d4e - name: os_horizon scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_horizon + src: https://github.com/openstack/openstack-ansible-os_horizon version: ec13e3b9e0c46616812c9278ddd606fdd3082682 - name: os_ironic scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_ironic + src: https://github.com/openstack/openstack-ansible-os_ironic version: 5b7f9f342f2346aa38f69204936d0d428800afed - name: os_magnum scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_magnum + src: https://github.com/openstack/openstack-ansible-os_magnum version: 1d55c75816b7eed495806e1793cbe130804af8fc - name: os_molteniron scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron + src: https://github.com/openstack/openstack-ansible-os_molteniron version: 07c6cdc462a56e6c76e5071414d35da3878aa14f - name: os_neutron scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_neutron + src: https://github.com/openstack/openstack-ansible-os_neutron version: 454d1f5c115a11023a33f60b0cdf8f687cfa3596 - name: os_nova scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_nova + src: https://github.com/openstack/openstack-ansible-os_nova version: d0154df0818cb1b97537e1d65409818959a021d4 - name: os_octavia scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_octavia + src: https://github.com/openstack/openstack-ansible-os_octavia version: 23ad1f1828c5ab1737cbaf48cd4b4a83f67a45d4 - name: os_rally scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_rally + src: https://github.com/openstack/openstack-ansible-os_rally version: 6c4e344def546adf76545d741a6ef24e5cbf7daa - name: os_sahara scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_sahara + src: https://github.com/openstack/openstack-ansible-os_sahara version: 06c328e1872cdce959bfa1e5c6cedf3c4cde65a6 - name: os_swift scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_swift + src: https://github.com/openstack/openstack-ansible-os_swift version: 37eb776041ad324a01bc673da0eb7894566f419d - name: os_tacker scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_tacker + src: https://github.com/openstack/openstack-ansible-os_tacker version: 68305ee8e03885967c95520614e50ba84176f5c1 - name: os_tempest scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_tempest + src: https://github.com/openstack/openstack-ansible-os_tempest version: 48d9b6d46965462aa01ef353ca06ffdbc5b55c33 - name: os_trove scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_trove + src: https://github.com/openstack/openstack-ansible-os_trove version: a63122f8fdffdf19719788911999fdb0e3b13fa5 - name: plugins scm: git - src: https://git.openstack.org/openstack/openstack-ansible-plugins + src: https://github.com/openstack/openstack-ansible-plugins version: a9ee4932cb30522549db4866148ef066e2e2ab7d - name: rabbitmq_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server + src: https://github.com/openstack/openstack-ansible-rabbitmq_server version: 52f3b38b630b54eb45e81a8f0b5348f72ffa967d - name: repo_build scm: git - src: https://git.openstack.org/openstack/openstack-ansible-repo_build + src: https://github.com/openstack/openstack-ansible-repo_build version: 1948d899a5c76143cf24c1a8ae162906a8e1faf1 - name: repo_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-repo_server + src: https://github.com/openstack/openstack-ansible-repo_server version: 0a3b993bf18f82fdf6199769302d971d917a8595 - name: rsyslog_client scm: git - src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client + src: https://github.com/openstack/openstack-ansible-rsyslog_client version: 6576a296328c7c2eeeec360978133913d81fb647 - name: rsyslog_server scm: git - src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server + src: https://github.com/openstack/openstack-ansible-rsyslog_server version: 3e1db84f1a9be6473bfbb8f80495f747b406e8ef - name: sshd scm: git diff --git a/xci/installer/osa/files/openstack_services.yml b/xci/installer/osa/files/openstack_services.yml index 30b47a19..65ff43f8 100644 --- a/xci/installer/osa/files/openstack_services.yml +++ b/xci/installer/osa/files/openstack_services.yml @@ -30,211 +30,211 @@ ## Global Requirements -requirements_git_repo: https://git.openstack.org/openstack/requirements +requirements_git_repo: https://github.com/openstack/requirements requirements_git_install_branch: 46890f5b5654c14c54a3c1990cb51a8e01b35791 # HEAD of "stable/queens" as of 13.02.2018 ## Aodh service -aodh_git_repo: https://git.openstack.org/openstack/aodh +aodh_git_repo: https://github.com/openstack/aodh aodh_git_install_branch: a1e60be0b8018fea95f2c0020545d0e6cd63fdbf # HEAD of "master" as of 10.02.2018 because no stable/queens branch yet aodh_git_project_group: aodh_all ## Barbican service -barbican_git_repo: https://git.openstack.org/openstack/barbican +barbican_git_repo: https://github.com/openstack/barbican barbican_git_install_branch: 5b525f6b0a7cf5342a9ffa3ca3618028d6d53649 # HEAD of "stable/queens" as of 13.02.2018 barbican_git_project_group: barbican_all ## Ceilometer service -ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer +ceilometer_git_repo: https://github.com/openstack/ceilometer ceilometer_git_install_branch: 71a13e1b831e782e7ca25aa0fcd9ebf92a830302 # HEAD of "stable/queens" as of 10.02.2018 ceilometer_git_project_group: ceilometer_all ## Cinder service -cinder_git_repo: https://git.openstack.org/openstack/cinder +cinder_git_repo: https://github.com/openstack/cinder cinder_git_install_branch: d02b6894f50f07ebd6f4e424f2438e58c234630d # HEAD of "stable/queens" as of 10.02.2018 cinder_git_project_group: cinder_all ## Designate service -designate_git_repo: https://git.openstack.org/openstack/designate +designate_git_repo: https://github.com/openstack/designate designate_git_install_branch: 5772ec049be2ae7570d98b4815be16947a045ff9 # HEAD of "stable/queens" as of 10.02.2018 designate_git_project_group: designate_all ## Horizon Designate dashboard plugin -designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard +designate_dashboard_git_repo: https://github.com/openstack/designate-dashboard designate_dashboard_git_install_branch: df336662cbda7befe177b780c95a61c72df6973d # HEAD of "stable/queens" as of 10.02.2018 designate_dashboard_git_project_group: horizon_all ## Dragonflow service -dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow +dragonflow_git_repo: https://github.com/openstack/dragonflow dragonflow_git_install_branch: 8285aff0bc1c2c1c28e2f16a341ab769b93c40d6 # HEAD of "master" as of 10.02.2018 because no stable/queens branch yet dragonflow_git_project_group: neutron_all ## Glance service -glance_git_repo: https://git.openstack.org/openstack/glance +glance_git_repo: https://github.com/openstack/glance glance_git_install_branch: cbd6c08c35b6469765ae9519513c46b2a563a586 # HEAD of "stable/queens" as of 10.02.2018 glance_git_project_group: glance_all ## Heat service -heat_git_repo: https://git.openstack.org/openstack/heat +heat_git_repo: https://github.com/openstack/heat heat_git_install_branch: 98636290c5a4ed9c7d608a1944124b5d92678107 # HEAD of "stable/queens" as of 10.02.2018 heat_git_project_group: heat_all ## Horizon service -horizon_git_repo: https://git.openstack.org/openstack/horizon +horizon_git_repo: https://github.com/openstack/horizon horizon_git_install_branch: d3b403a96cd32e5c2c14261c75daf35275dda66f # HEAD of "stable/queens" as of 10.02.2018 horizon_git_project_group: horizon_all ## Horizon Ironic dashboard plugin -ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui +ironic_dashboard_git_repo: https://github.com/openstack/ironic-ui ironic_dashboard_git_install_branch: 7614aa2504df1e6370b6d36fba57d27315287179 # HEAD of "stable/queens" as of 10.02.2018 ironic_dashboard_git_project_group: horizon_all ## Horizon Magnum dashboard plugin -magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui +magnum_dashboard_git_repo: https://github.com/openstack/magnum-ui magnum_dashboard_git_install_branch: c7692de7c046cab3a5669520818fbe61f17811c8 # HEAD of "master" as of 10.02.2018 because no stable/queens branch yet magnum_dashboard_git_project_group: horizon_all ## Horizon LBaaS dashboard plugin -neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard +neutron_lbaas_dashboard_git_repo: https://github.com/openstack/neutron-lbaas-dashboard neutron_lbaas_dashboard_git_install_branch: a42434a21bf95566472dc6c8ce078ca84432423d # HEAD of "stable/queens" as of 10.02.2018 neutron_lbaas_dashboard_git_project_group: horizon_all ## Horizon FWaaS dashboard plugin -neutron_fwaas_dashboard_git_repo: https://git.openstack.org//openstack/neutron-fwaas-dashboard +neutron_fwaas_dashboard_git_repo: https://github.com//openstack/neutron-fwaas-dashboard neutron_fwaas_dashboard_git_install_branch: 193940f465f9b5f1798f22239cc629d3ff3beece # HEAD of "stable/queens" as of 10.02.2018 neutron_fwaas_dashboard_git_project_group: horizon_all ## Horizon Sahara dashboard plugin -sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard +sahara_dashboard_git_repo: https://github.com/openstack/sahara-dashboard sahara_dashboard_git_install_branch: 03ef0ca66f72e3ccc6a7f01b26d6f43590701db9 # HEAD of "stable/queens" as of 10.02.2018 sahara_dashboard_git_project_group: horizon_all ## Keystone service -keystone_git_repo: https://git.openstack.org/openstack/keystone +keystone_git_repo: https://github.com/openstack/keystone keystone_git_install_branch: 30afb87247b6f6b7afbe431139e3471a2739aa1a # HEAD of "stable/queens" as of 10.02.2018 keystone_git_project_group: keystone_all ## Neutron service -neutron_git_repo: https://git.openstack.org/openstack/neutron +neutron_git_repo: https://github.com/openstack/neutron neutron_git_install_branch: e6b4fe995d903844c5d4c3dcd98bb424814eeb04 # HEAD of "stable/queens" as of 10.02.2018 neutron_git_project_group: neutron_all -neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas +neutron_lbaas_git_repo: https://github.com/openstack/neutron-lbaas neutron_lbaas_git_install_branch: f6b8b5b0ad2c19ddf6a7c102c706cbfdb0b2bf05 # HEAD of "stable/queens" as of 10.02.2018 neutron_lbaas_git_project_group: neutron_all -neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas +neutron_vpnaas_git_repo: https://github.com/openstack/neutron-vpnaas neutron_vpnaas_git_install_branch: 2e01dfec9fda930cf8c5ce4abca23b354859274a # HEAD of "stable/queens" as of 10.02.2018 neutron_vpnaas_git_project_group: neutron_all -neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas +neutron_fwaas_git_repo: https://github.com/openstack/neutron-fwaas neutron_fwaas_git_install_branch: 74c90445f8e25d0ae4fb45a48bfb5d5e670c82d8 # HEAD of "stable/queens" as of 10.02.2018 neutron_fwaas_git_project_group: neutron_all -neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing +neutron_dynamic_routing_git_repo: https://github.com/openstack/neutron-dynamic-routing neutron_dynamic_routing_git_install_branch: 4115b4972dc2e8e9ead82d9b7e63a516e404d28f # HEAD of "stable/queens" as of 10.02.2018 neutron_dynamic_routing_git_project_group: neutron_all -networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico +networking_calico_git_repo: https://github.com/openstack/networking-calico networking_calico_git_install_branch: cc3628125775f2f1b3c57c95db3d6b50278dc92b # HEAD of "stable/queens" as of 10.02.2018 because no stable/queens branch yet networking_calico_git_project_group: neutron_all -networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl +networking_odl_git_repo: https://github.com/openstack/networking-odl networking_odl_git_install_branch: ff80c7decc196cae5d7940aabbf14e5c37a94335 # HEAD of "stable/queens" as of 10.02.2018 networking_odl_git_project_group: neutron_all -networking_bgpvpn_git_repo: https://git.openstack.org/openstack/networking-bgpvpn +networking_bgpvpn_git_repo: https://github.com/openstack/networking-bgpvpn networking_bgpvpn_git_install_branch: 38781f232fa457c4032d6697ca9239dc538bc5c9 # HEAD of "stable/queens" as of 10.02.2018 networking_bgpvpn_git_project_group: neutron_all -networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc +networking_sfc_git_repo: https://github.com/openstack/networking-sfc networking_sfc_git_install_branch: 86f958ec212efdaa0508f71ebc389cc1b060ea34 # HEAD of "stable/queens" as of 10.02.2018 networking_sfc_git_project_group: neutron_all ## Nova service -nova_git_repo: https://git.openstack.org/openstack/nova +nova_git_repo: https://github.com/openstack/nova nova_git_install_branch: 01b756f960ed19ab801994d08d749dd94d729a22 # HEAD of "stable/queens" as of 10.02.2018 nova_git_project_group: nova_all ## PowerVM Virt Driver -nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm +nova_powervm_git_repo: https://github.com/openstack/nova-powervm nova_powervm_git_install_branch: a4e0721c6b307ab0046c3314aaa2b691ff8053df # HEAD of "stable/queens" as of 10.02.2018 nova_powervm_git_project_group: nova_all ## LXD Virt Driver -nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd +nova_lxd_git_repo: https://github.com/openstack/nova-lxd nova_lxd_git_install_branch: 16d06d149ed979745aa0ccd2b6db23122d17b57f # HEAD of "master" as of 10.02.2018 becayse no stable/queens branch yet nova_lxd_git_project_group: nova_all ## Sahara service -sahara_git_repo: https://git.openstack.org/openstack/sahara +sahara_git_repo: https://github.com/openstack/sahara sahara_git_install_branch: 4e2cf14ef9fb7c5c0009a2a6e53a28ac1748d9cb # HEAD of "stable/queens" as of 10.02.2018 sahara_git_project_group: sahara_all ## Swift service -swift_git_repo: https://git.openstack.org/openstack/swift +swift_git_repo: https://github.com/openstack/swift swift_git_install_branch: 700a6756da70026fbffe3977bd40fc73404b5e25 # HEAD of "stable/queens" as of 10.02.2018 swift_git_project_group: swift_all ## Swift3 middleware -swift_swift3_git_repo: https://git.openstack.org/openstack/swift3 +swift_swift3_git_repo: https://github.com/openstack/swift3 swift_swift3_git_install_branch: 1c117c96dda8113c3398c16e68b61efef397de74 # HEAD of "stable/queens" as of 10.02.2018 swift_swift3_git_project_group: swift_all ## Ironic service -ironic_git_repo: https://git.openstack.org/openstack/ironic +ironic_git_repo: https://github.com/openstack/ironic ironic_git_install_branch: 6ab2908f829f39f6fb438a7bae9b671abfa97588 # HEAD of "stable/queens" as of 10.02.2018 ironic_git_project_group: ironic_all ## Magnum service -magnum_git_repo: https://git.openstack.org/openstack/magnum +magnum_git_repo: https://github.com/openstack/magnum magnum_git_install_branch: 8e879f67dd21202f90504a86d617470fbe605338 # HEAD of "stable/queens" as of 10.02.2018 magnum_git_project_group: magnum_all ## Trove service -trove_git_repo: https://git.openstack.org/openstack/trove +trove_git_repo: https://github.com/openstack/trove trove_git_install_branch: 9e5186b95bba51d911a0de9e6d6bd412c478aef4 # HEAD of "stable/queens" as of 10.02.2018 trove_git_project_group: trove_all ## Horizon Trove dashboard plugin -trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard +trove_dashboard_git_repo: https://github.com/openstack/trove-dashboard trove_dashboard_git_install_branch: bd33e730f52889a6979e7d751e6732ce06806774 # HEAD of "stable/queens" as of 10.02.2018 trove_dashboard_git_project_group: horizon_all ## Octavia service -octavia_git_repo: https://git.openstack.org/openstack/octavia +octavia_git_repo: https://github.com/openstack/octavia octavia_git_install_branch: 45be6ff7cb06134c2b5a90af7d246316cd0495f8 # HEAD of "stable/queens" as of 10.02.2018 octavia_git_project_group: octavia_all ## Molteniron service -molteniron_git_repo: https://git.openstack.org/openstack/molteniron +molteniron_git_repo: https://github.com/openstack/molteniron molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 10.02.2018 because no stable/queens branch yet molteniron_git_project_group: molteniron_all ## Tacker service -tacker_git_repo: https://git.openstack.org/openstack/tacker +tacker_git_repo: https://github.com/openstack/tacker tacker_git_install_branch: 6932f5642598d53d93f94514eaed55cc93ea19d7 # HEAD of "stable/queens" as of 10.02.2018 tacker_git_project_group: tacker_all diff --git a/xci/scripts/update-osa-version-files.sh b/xci/scripts/update-osa-version-files.sh index 42405a3f..bb15fcba 100755 --- a/xci/scripts/update-osa-version-files.sh +++ b/xci/scripts/update-osa-version-files.sh @@ -96,6 +96,10 @@ fi cp $tempdir/openstack-ansible/playbooks/defaults/repo_packages/openstack_services.yml ${releng_xci_base}/installer/osa/files/. cp $tempdir/openstack-ansible/global-requirement-pins.txt ${releng_xci_base}/installer/osa/files/. +# Switch sources from git.openstack.org to github.com +sed -i "s@^src:.*git\.openstack\.org/\(.*\)@src: https://github\.com/\1@g" ${releng_xci_base}/installer/osa/files/ansible-role-requirements.yml +sed -i "s@\(^.*git_repo:\).*git\.openstack\.org/\(.*\)@\1 https://github\.com/\2@g" ${releng_xci_base}/installer/osa/files/openstack_services.yml + popd &> /dev/null printme "" diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index b11673c1..3d5854a4 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -64,6 +64,8 @@ source "$XCI_PATH/xci/config/${XCI_FLAVOR}-vars" source "$XCI_PATH/xci/installer/${INSTALLER_TYPE}/env" &>/dev/null || true # source xci configuration source $XCI_PATH/xci/config/env-vars +# Make sure we pass XCI_PATH everywhere +export XCI_ANSIBLE_PARAMS+=" -e XCI_PATH=${XCI_PATH}" if [[ -z $(echo $PATH | grep "$HOME/.local/bin") ]]; then export PATH="$HOME/.local/bin:$PATH" @@ -113,7 +115,7 @@ echo "-------------------------------------------------------------------------" echo "Info: Cloning OPNFV scenario repositories" echo "-------------------------------------------------------------------------" cd $XCI_PATH/xci/playbooks -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i "localhost," get-opnfv-scenario-requirements.yml +ansible-playbook ${XCI_ANSIBLE_PARAMS} -i "localhost," get-opnfv-scenario-requirements.yml echo "-------------------------------------------------------------------------" #------------------------------------------------------------------------------- @@ -138,7 +140,7 @@ sudo sed -i "s/^Defaults.*env_reset/#&/" /etc/sudoers cd $XCI_PATH/bifrost/ sudo -E bash ./scripts/destroy-env.sh cd $XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i "localhost," bootstrap-bifrost.yml +ansible-playbook ${XCI_ANSIBLE_PARAMS} -i "localhost," bootstrap-bifrost.yml cd ${XCI_CACHE}/repos/bifrost bash ./scripts/bifrost-provision.sh echo "-----------------------------------------------------------------------" |