diff --git a/roles/baremetal-undercloud/packages/defaults/main.yml b/roles/baremetal-undercloud/packages/defaults/main.yml index 19eb63447..cf4a84f78 100644 --- a/roles/baremetal-undercloud/packages/defaults/main.yml +++ b/roles/baremetal-undercloud/packages/defaults/main.yml @@ -4,7 +4,7 @@ undercloud_additional_pkgs: - vim - tmux - openssl - - wget + - curl - bind-utils - net-tools - git diff --git a/roles/build-images/templates/overcloud-image-build.sh.j2 b/roles/build-images/templates/overcloud-image-build.sh.j2 index f1cf3d351..5766bc79e 100644 --- a/roles/build-images/templates/overcloud-image-build.sh.j2 +++ b/roles/build-images/templates/overcloud-image-build.sh.j2 @@ -26,7 +26,7 @@ export DIB_YUM_REPO_CONF="" export DIB_YUM_REPO_CONF="$DIB_YUM_REPO_CONF {{ repo_path }}" {% endfor %} {% if base_image_url is defined and base_image_path is defined %} -wget -nv {{ base_image_url }} -O {{ base_image_path }} +curl -Lo {{ base_image_path }} {{ base_image_url }} export DIB_LOCAL_IMAGE={{ base_image_path }} {% endif %} {# note(trown): there was not support in tripleoclient for YAML config images in Newton #} diff --git a/roles/create-zuul-based-reproducer/templates/README-reproducer-zuul-based-quickstart.html.j2 b/roles/create-zuul-based-reproducer/templates/README-reproducer-zuul-based-quickstart.html.j2 index 55f378463..986b86797 100644 --- a/roles/create-zuul-based-reproducer/templates/README-reproducer-zuul-based-quickstart.html.j2 +++ b/roles/create-zuul-based-reproducer/templates/README-reproducer-zuul-based-quickstart.html.j2 @@ -176,7 +176,7 @@ EOF"

wget or curl the reproducer-quickstart/reproducer-zuul-based-quickstart.tar file.


-    wget http://logs.openstack.org/79/657779/2/check/tripleo-ci-centos-7-standalone-upgrade/92fd476/logs/reproducer-quickstart/reproducer-zuul-based-quickstart.tar
+    curl -Lo reproducer-zuul-based-quickstart.tar http://logs.openstack.org/79/657779/2/check/tripleo-ci-centos-7-standalone-upgrade/92fd476/logs/reproducer-quickstart/reproducer-zuul-based-quickstart.tar
     tar -xvf reproducer-zuul-based-quickstart.tar
 
One of the extracted files is the script called ./reproducer-zuul-based-quickstart.sh diff --git a/roles/create-zuul-based-reproducer/templates/reproducer-fresh-box-setup.sh.j2 b/roles/create-zuul-based-reproducer/templates/reproducer-fresh-box-setup.sh.j2 index 424abbf1a..0ec341108 100644 --- a/roles/create-zuul-based-reproducer/templates/reproducer-fresh-box-setup.sh.j2 +++ b/roles/create-zuul-based-reproducer/templates/reproducer-fresh-box-setup.sh.j2 @@ -1,7 +1,7 @@ #!/bin/bash REPRO_USER=${REPRO_USER:=reprozuul} -REPRO_DEPS="tar wget screen" +REPRO_DEPS="tar curl screen" RDO_USER="" RDO_PASS="" CLOUDS_YAML_PATH=".config/openstack/" diff --git a/roles/freeipa-setup/templates/deploy_freeipa.sh.j2 b/roles/freeipa-setup/templates/deploy_freeipa.sh.j2 index 376d7f5af..c7b5876b8 100644 --- a/roles/freeipa-setup/templates/deploy_freeipa.sh.j2 +++ b/roles/freeipa-setup/templates/deploy_freeipa.sh.j2 @@ -28,11 +28,11 @@ sed -i "1i$IPA_SERVER_IP $CA_SERVER_HOSTNAME" /etc/hosts ## * Install required system packages:: -yum install -yq ipa-server ipa-server-dns wget epel-release +yum install -yq ipa-server ipa-server-dns curl epel-release ## * Increase system entropy (to prevent slow down during IPA installation):: -wget https://centos7.iuscommunity.org/ius-release.rpm +curl -Lo ius-release.rpm https://centos7.iuscommunity.org/ius-release.rpm rpm -Uvh ius-release*.rpm yum install -y haveged systemctl start haveged.service diff --git a/roles/nodepool-setup/defaults/main.yml b/roles/nodepool-setup/defaults/main.yml index 2cc0986f0..4707fed7b 100644 --- a/roles/nodepool-setup/defaults/main.yml +++ b/roles/nodepool-setup/defaults/main.yml @@ -23,5 +23,5 @@ packages_list: - unbound - screen - vim - - wget + - curl - iptables-services