Cleaner split of kolla-ansible install and configure

ansible/install.yml

@@ -0,0 +1,18 @@
+---
+
+- name: Ensure depnedencies are installed
+  hosts: localhost
+  gather_facts: true
+  tags:
+    - kolla-ansible
+    - install
+  tasks:
+    - name: Install Kayobe dependencies
+      import_role:
+        name: bootstrap
+        tasks_from: install.yml
+
+    - name: Install kolla-ansible
+      import_role:
+        name: kolla-ansible
+        tasks_from: install.yml

ansible/roles/bootstrap/tasks/install.yml

@@ -0,0 +1,46 @@
+---
+- block:
+    - name: Testing privilege escalation
+      raw: "true"
+      become: true
+      failed_when: false
+      changed_when: false
+      register: privilege_escalation_result
+
+    - name: Assert that we can escalate privileges
+      assert:
+        that:
+          - privilege_escalation_result is success
+          - '"password is required" not in privilege_escalation_result.stderr'
+        fail_msg: >-
+          Could not escalate privileges. You can either: set kayobe_control_host_become: true,
+          set ansible_become_password, or set up passwordless sudo.
+  when: kayobe_control_host_become | bool
+
+- name: Include OS family-specific variables
+  include_vars: "{{ ansible_facts.os_family }}.yml"
+
+- name: Gather the package facts
+  ansible.builtin.package_facts:
+    manager: auto
+
+- block:
+    - name: Assert that all packages are installed if not using privilege escalation
+      assert:
+        that: missing_packages is falsy
+        fail_msg: >-
+          The following packages are missing from your system: {{ missing_packages | join(', ') }} and
+          privilege escalation is disabled. Please get your system administator to install these packages
+          or enable kayobe_control_host_become.
+      when: not kayobe_control_host_become | bool
+
+    - name: Ensure required packages are installed
+      package:
+        name: "{{ bootstrap_package_dependencies }}"
+        state: present
+        cache_valid_time: "{{ apt_cache_valid_time if ansible_facts.os_family == 'Debian' else omit }}"
+        update_cache: "{{ True if ansible_facts.os_family == 'Debian' else omit }}"
+      become: True
+      when: missing_packages is truthy
+  vars:
+    missing_packages: "{{ bootstrap_package_dependencies | difference(ansible_facts.packages.keys()) }}"

ansible/roles/bootstrap/tasks/main.yml

@@ -1,50 +1,3 @@
----
-- block:
-    - name: Testing privilege escalation
-      raw: "true"
-      become: true
-      failed_when: false
-      changed_when: false
-      register: privilege_escalation_result
-
-    - name: Assert that we can escalate privileges
-      assert:
-        that:
-          - privilege_escalation_result is success
-          - '"password is required" not in privilege_escalation_result.stderr'
-        fail_msg: >-
-          Could not escalate privileges. You can either: set kayobe_control_host_become: true,
-          set ansible_become_password, or set up passwordless sudo.
-  when: kayobe_control_host_become | bool
-
-- name: Include OS family-specific variables
-  include_vars: "{{ ansible_facts.os_family }}.yml"
-
-- name: Gather the package facts
-  ansible.builtin.package_facts:
-    manager: auto
-
-- block:
-    - name: Assert that all packages are installed if not using privilege escalation
-      assert:
-        that: missing_packages is falsy
-        fail_msg: >-
-          The following packages are missing from your system: {{ missing_packages | join(', ') }} and
-          privilege escalation is disabled. Please get your system administator to install these packages
-          or enable kayobe_control_host_become.
-      when: not kayobe_control_host_become | bool
-
-    - name: Ensure required packages are installed
-      package:
-        name: "{{ bootstrap_package_dependencies }}"
-        state: present
-        cache_valid_time: "{{ apt_cache_valid_time if ansible_facts.os_family == 'Debian' else omit }}"
-        update_cache: "{{ True if ansible_facts.os_family == 'Debian' else omit }}"
-      become: True
-      when: missing_packages is truthy
-  vars:
-    missing_packages: "{{ bootstrap_package_dependencies | difference(ansible_facts.packages.keys()) }}"
-
 - name: Check whether an SSH key exists
   stat:
     path: "{{ bootstrap_ssh_private_key_path }}"

ansible/roles/kolla-ansible/tasks/install.yml

@@ -44,7 +44,7 @@
       package:
         name: "{{ packages }}"
         state: present
-        cache_valid_time: "{{ apt_cache_valid_time if ansible_facts.os_family == 'Debian' else omit }}"
+        cache_valid_time: "{{ apt_cache_valid_time | default(3600) if ansible_facts.os_family == 'Debian' else omit }}"
         update_cache: "{{ True if ansible_facts.os_family == 'Debian' else omit }}"
       become: True
       when: missing_packages is truthy

ansible/roles/kolla-ansible/tasks/main.yml

@@ -1,10 +1,4 @@
 ---
-# NOTE: Use import_tasks here, since tags are not applied to tasks included via
-# include_tasks.
-- import_tasks: install.yml
-  tags:
-    - install
-
 - import_tasks: config.yml
   tags:
     - config

ansible/roles/kolla-ansible/tests/test-defaults.yml

@@ -9,6 +9,17 @@
       register: tempfile_result
 
     - block:
+        - name: Install dependencies
+          include_role:
+            name: "{{ playbook_dir }}/.."
+            tasks_from: install.yml
+          vars:
+            kolla_ansible_source_path: "{{ temp_path }}/src"
+            kolla_ansible_ctl_install_type: "source"
+            kolla_ansible_source_url: "http://github.com/openstack/kolla-ansible"
+            kolla_ansible_source_version: "{{ openstack_branch }}"
+            kolla_ansible_venv: "{{ temp_path }}/venv"
+
         - name: Test the kolla-ansible role with default values
           include_role:
             name: "{{ playbook_dir }}/.."
@@ -41,7 +52,6 @@
             kolla_openstack_logging_debug: False
             kolla_globals_paths_extra:
               - "{{ tempfile_result.path ~ '/etc/kayobe/' }}"
-            apt_cache_valid_time: 3600
 
         - name: Verify kolla-ansible installation
           shell: ". {{ temp_path }}/venv/bin/activate && kolla-ansible -h"

ansible/roles/kolla-ansible/tests/test-extras.yml

@@ -81,6 +81,17 @@
           bogus backend certificate
 
     - block:
+        - name: Install dependencies
+          include_role:
+            name: "{{ playbook_dir }}/.."
+            tasks_from: install.yml
+          vars:
+            kolla_ansible_source_path: "{{ temp_path }}/src"
+            kolla_ansible_ctl_install_type: "source"
+            kolla_ansible_source_url: "http://github.com/openstack/kolla-ansible"
+            kolla_ansible_source_version: "{{ openstack_branch }}"
+            kolla_ansible_venv: "{{ temp_path }}/venv"
+
         - name: Test the kolla-ansible role with default values
           include_role:
             name: ../../kolla-ansible
@@ -195,7 +206,6 @@
               custom-password-1: "custom-password-1"
               custom-password-2: "custom-password-2"
             kolla_nova_compute_ironic_host: "controller1"
-            apt_cache_valid_time: 3600
 
         - name: Verify kolla-ansible installation
           shell: ". {{ temp_path }}/venv/bin/activate && kolla-ansible -h"

ansible/roles/kolla-ansible/tests/test-globals-merge.yml

@@ -9,6 +9,16 @@
       register: tempfile_result
 
     - block:
+        - name: Install dependencies
+          include_role:
+            name: "{{ playbook_dir }}/.."
+            tasks_from: install.yml
+          vars:
+            kolla_ansible_source_path: "{{ temp_path }}/src"
+            kolla_ansible_ctl_install_type: "source"
+            kolla_ansible_source_url: "http://github.com/openstack/kolla-ansible"
+            kolla_ansible_source_version: "{{ openstack_branch }}"
+            kolla_ansible_venv: "{{ temp_path }}/venv"
 
         - name: Ensure directories exists
           file:
@@ -74,7 +84,6 @@
               - "{{ tempfile_result.path ~ '/etc/kayobe/' }}"
               - "{{ tempfile_result.path ~ '/etc/kayobe/environments/level1/' }}"
               - "{{ tempfile_result.path ~ '/etc/kayobe/environments/level2/' }}"
-            apt_cache_valid_time: 3600
 
         - name: Verify kolla-ansible installation
           shell: ". {{ temp_path }}/venv/bin/activate && kolla-ansible -h"

ansible/roles/kolla-ansible/tests/test-requirements.yml

@@ -11,7 +11,8 @@
     - block:
         - name: Test the kolla-ansible role with extra Python requirements
           include_role:
-            name: ../../kolla-ansible
+            name: "{{ playbook_dir }}/.."
+            tasks_from: install.yml
           vars:
             kolla_ansible_source_path: "{{ temp_path }}/src"
             kolla_ansible_ctl_install_type: "source"
@@ -39,7 +40,6 @@
             kolla_openstack_logging_debug: False
             kolla_globals_paths_extra:
               - "{{ tempfile_result.path ~ '/etc/kayobe/' }}"
-            apt_cache_valid_time: 3600
 
         - name: List Python packages installed in virtualenv
           command: "{{ temp_path }}/venv/bin/pip list"

kayobe/cli/commands.py

@@ -18,6 +18,7 @@
 import os
 import re
 import sys
+import yaml
 
 from cliff.command import Command
 from cliff.hooks import CommandHook
@@ -301,13 +302,48 @@ def get_parser(self, prog_name):
         group = parser.add_argument_group("Host Bootstrap")
         group.add_argument("--add-known-hosts", action='store_true',
                            help="add SSH known hosts entries for each host")
+        install_group = group.add_mutually_exclusive_group()
+        install_group.add_argument(
+            "--no-install",
+            action='store_true',
+            default=yaml.safe_load(os.getenv("KAYOBE_NO_INSTALL", "false")),
+            help=("skip dependency installation and run later bootstrap "
+                  "steps only (default from KAYOBE_NO_INSTALL env var)"),
+        )
+        install_group.add_argument(
+            "--install-only",
+            action='store_true',
+            default=yaml.safe_load(os.getenv("KAYOBE_INSTALL_ONLY", "false")),
+            help=("only install dependencies "
+                  "(default from KAYOBE_INSTALL_ONLY env var)"),
+        )
         return parser
 
     def take_action(self, parsed_args):
         self.app.LOG.debug("Bootstrapping Kayobe Ansible control host")
-        self.handle_kolla_tags_limits_deprecation(parsed_args)
-        ansible.install_galaxy_roles(parsed_args)
-        ansible.install_galaxy_collections(parsed_args)
+
+        if parsed_args.install_only and parsed_args.no_install:
+            self.app.LOG.error("--install-only and --no-install are "
+                               "mutually exclusive")
+            sys.exit(1)
+
+        if parsed_args.no_install:
+            self.app.LOG.debug("Skipping dependency and Galaxy installation "
+                               "due to "
+                               "--no-install")
+        else:
+            ansible.install_galaxy_roles(parsed_args)
+            ansible.install_galaxy_collections(parsed_args)
+
+            playbooks = _build_playbook_list("install")
+            self.run_kayobe_playbooks(parsed_args, playbooks,
+                                      ignore_limit=True)
+
+            if parsed_args.install_only:
+                self.app.LOG.debug("Skipping reset of bootstrap due to "
+                                   "--install-only")
+                return
+
         playbooks = _build_playbook_list("bootstrap")
         self.run_kayobe_playbooks(parsed_args, playbooks, ignore_limit=True)
 
@@ -455,11 +491,11 @@ def take_action(self, parsed_args):
         # Use force to upgrade roles and collections.
         ansible.install_galaxy_roles(parsed_args, force=True)
         ansible.install_galaxy_collections(parsed_args, force=True)
+        playbooks = _build_playbook_list("install")
+        self.run_kayobe_playbooks(parsed_args, playbooks, ignore_limit=True)
+
         playbooks = _build_playbook_list("bootstrap")
         self.run_kayobe_playbooks(parsed_args, playbooks, ignore_limit=True)
-        playbooks = _build_playbook_list("kolla-ansible")
-        self.run_kayobe_playbooks(parsed_args, playbooks, tags="install",
-                                  ignore_limit=True, check=False)
 
 
 class ControlHostServiceDeploy(KayobeAnsibleMixin, VaultMixin, Command):