diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index 42bfa29bb3..bf37167eb3 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -18,13 +18,6 @@ debug: False verbose: True -## Repo server -repo_service_user_name: nginx -repo_service_home_folder: /var/www -repo_server_port: 8181 -repo_pip_default_index: "http://{{ openstack_upstream_domain }}/pools" - - ## Rsyslog server rsyslog_server_spool_directory: /var/spool/rsyslog rsyslog_server_storage_directory: /var/log/log-storage @@ -34,20 +27,28 @@ rsyslog_server_storage_directory: /var/log/log-storage openstack_release: master # URL for the frozen internal openstack repo. openstack_repo_url: "http://{{ internal_lb_vip_address }}:{{ repo_server_port }}" +openstack_upstream_proto: "https" openstack_upstream_domain: "rpc-repo.rackspace.com" -openstack_upstream_url: "http://{{ openstack_upstream_domain }}" +openstack_upstream_url: "{{ openstack_upstream_proto }}://{{ openstack_upstream_domain }}" # Global minimum kernel requirement openstack_host_required_kernel: 3.13.0-34-generic +## Repo server +repo_service_user_name: nginx +repo_service_home_folder: /var/www +repo_server_port: 8181 +repo_pip_default_index: "{{ openstack_upstream_url }}/pools" + + ## LXC options lxc_container_caches: - url: "{{ openstack_upstream_url }}/container_images/rpc-trusty-container.tgz" name: "trusty.tgz" # In container APT repository settings -lxc_container_template_main_apt_repo: "http://mirror.rackspace.com/ubuntu" -lxc_container_template_security_apt_repo: "http://mirror.rackspace.com/ubuntu" +lxc_container_template_main_apt_repo: "https://mirror.rackspace.com/ubuntu" +lxc_container_template_security_apt_repo: "https://mirror.rackspace.com/ubuntu" ## RabbitMQ diff --git a/playbooks/roles/galera_client/defaults/main.yml b/playbooks/roles/galera_client/defaults/main.yml index 20f1d007ae..74a28f7642 100644 --- a/playbooks/roles/galera_client/defaults/main.yml +++ b/playbooks/roles/galera_client/defaults/main.yml @@ -25,7 +25,7 @@ galera_client_gpg_keys: hash_id: '0xcbcb082a1bb943db' # Repositories -galera_client_apt_repo_url: "http://mirror.rackspace.com/mariadb/repo/5.5/ubuntu" +galera_client_apt_repo_url: "https://mirror.rackspace.com/mariadb/repo/5.5/ubuntu" galera_client_apt_repo: repo: "deb {{ galera_client_apt_repo_url }} {{ ansible_distribution_release }} main" state: "present" diff --git a/playbooks/roles/galera_server/defaults/main.yml b/playbooks/roles/galera_server/defaults/main.yml index 924f49e0af..da6f115e43 100644 --- a/playbooks/roles/galera_server/defaults/main.yml +++ b/playbooks/roles/galera_server/defaults/main.yml @@ -52,7 +52,7 @@ galera_gpg_keys: hash_id: '0xcbcb082a1bb943db' # Repositories -galera_apt_repo_url: "http://mirror.rackspace.com/mariadb/repo/5.5/ubuntu" +galera_apt_repo_url: "https://mirror.rackspace.com/mariadb/repo/5.5/ubuntu" galera_apt_repo: repo: "deb {{ galera_apt_repo_url }} {{ ansible_distribution_release }} main" state: "present" diff --git a/playbooks/roles/lxc_container_create/defaults/main.yml b/playbooks/roles/lxc_container_create/defaults/main.yml index 9bff6169ca..8a7cf1c8cd 100644 --- a/playbooks/roles/lxc_container_create/defaults/main.yml +++ b/playbooks/roles/lxc_container_create/defaults/main.yml @@ -36,8 +36,8 @@ lxc_container_template_options: > --user {{ lxc_container_user_name }} --password {{ lxc_container_user_password }} -lxc_container_template_main_apt_repo: "http://archive.ubuntu.com/ubuntu" -lxc_container_template_security_apt_repo: "http://security.ubuntu.com/ubuntu" +lxc_container_template_main_apt_repo: "https://mirror.rackspace.com/ubuntu" +lxc_container_template_security_apt_repo: "https://mirror.rackspace.com/ubuntu" lxc_container_default_interfaces: | # The loopback network interface diff --git a/playbooks/roles/lxc_hosts/defaults/main.yml b/playbooks/roles/lxc_hosts/defaults/main.yml index 82ecba9210..f049eeeb6f 100644 --- a/playbooks/roles/lxc_hosts/defaults/main.yml +++ b/playbooks/roles/lxc_hosts/defaults/main.yml @@ -40,8 +40,8 @@ lxc_kernel_options: - { key: 'fs.inotify.max_user_instances', value: 1024 } - { key: 'vm.swappiness', value: 10 } -lxc_container_template_main_apt_repo: "http://archive.ubuntu.com/ubuntu" -lxc_container_template_security_apt_repo: "http://security.ubuntu.com/ubuntu" +lxc_container_template_main_apt_repo: "https://mirror.rackspace.com/ubuntu" +lxc_container_template_security_apt_repo: "https://mirror.rackspace.com/ubuntu" # Required apt packages. diff --git a/playbooks/roles/rabbitmq_server/defaults/main.yml b/playbooks/roles/rabbitmq_server/defaults/main.yml index e0484720c3..f3a45791c5 100644 --- a/playbooks/roles/rabbitmq_server/defaults/main.yml +++ b/playbooks/roles/rabbitmq_server/defaults/main.yml @@ -18,7 +18,7 @@ is_metal: true rabbitmq_primary_cluster_node: "{{ groups['rabbitmq_all'][0] }}" -rabbitmq_package_url: http://www.rabbitmq.com/releases/rabbitmq-server/v3.5.1/rabbitmq-server_3.5.1-1_all.deb +rabbitmq_package_url: https://www.rabbitmq.com/releases/rabbitmq-server/v3.5.1/rabbitmq-server_3.5.1-1_all.deb rabbitmq_package_sha256: "e514012a210b4ed5b77d726329ce027c50e8629c396bcde451ac16aaff07d047" rabbitmq_package_path: "/opt/rabbitmq-server.deb" diff --git a/playbooks/roles/repo_server/files/openstack-wheel-builder.py b/playbooks/roles/repo_server/files/openstack-wheel-builder.py index 52b0f8aab0..2ab8f4b398 100755 --- a/playbooks/roles/repo_server/files/openstack-wheel-builder.py +++ b/playbooks/roles/repo_server/files/openstack-wheel-builder.py @@ -345,7 +345,7 @@ def main(): '--pip-extra-link-dirs', _abs_path(user_vars['link_pool']), '--pip-index', - 'http://rpc-repo.rackspace.com/pools', + 'https://rpc-repo.rackspace.com/pools', '--pip-extra-index', 'https://pypi.python.org/simple', '--pip-bulk-operation', diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh index ae5b08e253..d1b990dd15 100755 --- a/scripts/bootstrap-aio.sh +++ b/scripts/bootstrap-aio.sh @@ -42,8 +42,8 @@ export TEMPEST_FATAL_DEPRECATIONS=${TEMPEST_FATAL_DEPRECATIONS:-"no"} # Ubuntu repos UBUNTU_RELEASE=$(lsb_release -sc) -UBUNTU_REPO=${UBUNTU_REPO:-"http://mirror.rackspace.com/ubuntu"} -UBUNTU_SEC_REPO=${UBUNTU_SEC_REPO:-"http://mirror.rackspace.com/ubuntu"} +UBUNTU_REPO=${UBUNTU_REPO:-"https://mirror.rackspace.com/ubuntu"} +UBUNTU_SEC_REPO=${UBUNTU_SEC_REPO:-"https://mirror.rackspace.com/ubuntu"} ## Library Check ------------------------------------------------------------- @@ -91,6 +91,9 @@ if [ ! "$(grep -e '^nameserver 8.8.8.8' -e '^nameserver 8.8.4.4' /etc/resolv.con echo -e '\n# Adding google name servers\nnameserver 8.8.8.8\nnameserver 8.8.4.4' | tee -a /etc/resolv.conf fi +# Ensure that the https apt transport is available before doing anything else +apt-get update && apt-get install -y apt-transport-https + # Set the host repositories to only use the same ones, always, for the sake of consistency. cat > /etc/apt/sources.list <