Merge pull request #218 from bbezak/stable/wallaby

sync stable/wallaby with upstream

Author: bbezak

ansible/apt.yml

@@ -0,0 +1,12 @@
+---
+- name: Ensure APT is configured
+  hosts: seed-hypervisor:seed:overcloud
+  vars:
+    ansible_python_interpreter: /usr/bin/python3
+  tags:
+    - apt
+  tasks:
+    - name: include apt role
+      include_role:
+        name: apt
+      when: ansible_facts.os_family == 'Debian'

ansible/group_vars/all/apt

@@ -4,3 +4,9 @@
 
 # Apt cache TTL in seconds. Default is 3600.
 apt_cache_valid_time: 3600
+
+# Apt proxy URL for HTTP. Default is empty (no proxy).
+apt_proxy_http:
+
+# Apt proxy URL for HTTPS. Default is {{ apt_proxy_http }}.
+apt_proxy_https: "{{ apt_proxy_http }}"

ansible/group_vars/all/bifrost

@@ -11,6 +11,10 @@ kolla_bifrost_source_url: "https://opendev.org/openstack/bifrost"
 # {{ openstack_branch }}.
 kolla_bifrost_source_version: "{{ openstack_branch }}"
 
+# Whether Bifrost uses firewalld. Default value is false to avoid conflicting
+# with iptables rules configured on the seed host by Kayobe.
+kolla_bifrost_use_firewalld: False
+
 # Firewalld zone used by Bifrost. Default is "trusted", to avoid blocking other
 # services running on the seed host.
 kolla_bifrost_firewalld_internal_zone: trusted

ansible/group_vars/all/globals

@@ -51,3 +51,14 @@ os_distribution: "centos"
 # OS release. Valid options are "8-stream" when os_distribution is "centos", or
 # "focal" when os_distribution is "ubuntu".
 os_release: "{{ '8-stream' if os_distribution == 'centos' else 'focal' }}"
+
+###############################################################################
+# Ansible configuration.
+
+# Filter to apply to the setup module when gathering facts. Default is to not
+# specify a filter.
+kayobe_ansible_setup_filter: "{{ omit }}"
+
+# Gather subset to apply to the setup module when gathering facts. Default is
+# to not specify a gather subset.
+kayobe_ansible_setup_gather_subset: "{{ omit }}"

ansible/kayobe-ansible-user.yml

@@ -40,6 +40,9 @@
   gather_facts: no
   vars:
     ansible_user: "{{ bootstrap_user }}"
+    dnf_options:
+      - "-y"
+      - "{% if 'proxy' in dnf_config %}--setopt=proxy={{ dnf_config['proxy'] }}{% endif %}"
   tags:
     - ensure-python
   tasks:
@@ -49,8 +52,9 @@
       failed_when: false
       register: check_python
 
+    # TODO(priteau): Support apt proxy
     - name: Ensure python is installed
-      raw: test -e /usr/bin/apt && (sudo apt -y update && sudo apt install -y python3-minimal) || (sudo dnf -y install python3)
+      raw: "test -e /usr/bin/apt && (sudo apt -y update && sudo apt install -y python3-minimal) || (sudo dnf {{ dnf_options | select | join(' ') }} install python3)"
       when: check_python.rc != 0
 
 - name: Ensure the Kayobe Ansible user account exists

ansible/kayobe-target-venv.yml

@@ -19,7 +19,9 @@
     - block:
         - name: Gather facts
           setup:
-          when: not ansible_facts.module_setup | default(false)
+            filter: "{{ kayobe_ansible_setup_filter }}"
+            gather_subset: "{{ kayobe_ansible_setup_gather_subset }}"
+          when: not ansible_facts
           register: gather_facts
 
         - name: Ensure the Python virtualenv package is installed
@@ -79,6 +81,8 @@
     # again using the interpreter from the virtual environment.
     - name: Gather facts
       setup:
+        filter: "{{ kayobe_ansible_setup_filter }}"
+        gather_subset: "{{ kayobe_ansible_setup_gather_subset }}"
       when:
         - virtualenv is defined
         - gather_facts is not skipped

ansible/kolla-target-venv.yml

@@ -21,7 +21,9 @@
     - block:
         - name: Gather facts
           setup:
-          when: not ansible_facts.module_setup | default(false)
+            filter: "{{ kayobe_ansible_setup_filter }}"
+            gather_subset: "{{ kayobe_ansible_setup_gather_subset }}"
+          when: not ansible_facts
 
         - name: Ensure the Python virtualenv package is installed
           package:

ansible/overcloud-facts-gather.yml

@@ -0,0 +1,10 @@
+---
+- name: Gather facts
+  hosts: overcloud
+  gather_facts: false
+  tasks:
+    - name: Gather facts
+      setup:
+        filter: "{{ kayobe_ansible_setup_filter }}"
+        gather_subset: "{{ kayobe_ansible_setup_gather_subset }}"
+      when: not ansible_facts

ansible/roles/apt/defaults/main.yml

@@ -0,0 +1,12 @@
+---
+###############################################################################
+# Apt package manager configuration.
+
+# Apt cache TTL in seconds. Default is 3600.
+apt_cache_valid_time: 3600
+
+# Apt proxy URL for HTTP. Default is empty (no proxy).
+apt_proxy_http:
+
+# Apt proxy URL for HTTPS. Default is {{ apt_proxy_http }}.
+apt_proxy_https: "{{ apt_proxy_http }}"

ansible/roles/apt/tasks/main.yml

@@ -0,0 +1,17 @@
+---
+- name: Configure apt proxy
+  template:
+    src: "01proxy.j2"
+    dest: /etc/apt/apt.conf.d/01proxy
+    owner: root
+    group: root
+    mode: 0664
+  become: true
+  when: apt_proxy_http | default('', true) | length > 0 or apt_proxy_https | default('', true) | length > 0
+
+- name: Remove old apt proxy config
+  file:
+    path: /etc/apt/apt.conf.d/01proxy
+    state: absent
+  become: true
+  when: apt_proxy_http | default('', true) | length == 0 and apt_proxy_https | default('', true) | length == 0