Browse Source

Synchronise with stable/ocata

Mark Goddard 1 year ago
parent
commit
b8fc530c91
2 changed files with 31 additions and 7 deletions
  1. 9
    6
      etc/kayobe/globals.yml
  2. 22
    1
      etc/kayobe/kolla.yml

+ 9
- 6
etc/kayobe/globals.yml View File

@@ -2,21 +2,24 @@
2 2
 # Kayobe global configuration.
3 3
 
4 4
 ###############################################################################
5
-# Path configuration.
5
+# Local path configuration (ansible control host).
6 6
 
7
-# Path to Kayobe configuration.
7
+# Path to Kayobe configuration directory on ansible control host.
8 8
 #kayobe_config_path:
9 9
 
10
-# Path in which to store data locally.
10
+###############################################################################
11
+# Remote path configuration (seed, seed-hypervisor and overcloud hosts).
12
+
13
+# Base path for kayobe state on remote hosts.
11 14
 #base_path:
12 15
 
13
-# Path in which to cache downloaded images.
16
+# Path in which to cache downloaded images on remote hosts.
14 17
 #image_cache_path:
15 18
 
16
-# Path on which to checkout source code repositories.
19
+# Path on which to checkout source code repositories on remote hosts.
17 20
 #source_checkout_path:
18 21
 
19
-# Path on which to create python virtualenvs.
22
+# Path on which to create python virtualenvs on remote hosts.
20 23
 #virtualenv_path:
21 24
 
22 25
 ###############################################################################

+ 22
- 1
etc/kayobe/kolla.yml View File

@@ -7,6 +7,9 @@
7 7
 # Type of Kolla control installation. One of 'binary' or 'source'.
8 8
 #kolla_ctl_install_type:
9 9
 
10
+# Path to directory for kolla source code checkout.
11
+#kolla_source_path:
12
+
10 13
 # URL of Kolla source code repository if type is 'source'.
11 14
 #kolla_source_url:
12 15
 
@@ -14,6 +17,18 @@
14 17
 # 'source'.
15 18
 #kolla_source_version:
16 19
 
20
+# Path to virtualenv in which to install kolla.
21
+#kolla_venv:
22
+
23
+###############################################################################
24
+# Kolla-ansible installation.
25
+
26
+# Type of Kolla-ansible control installation. One of 'binary' or 'source'.
27
+#kolla_ansible_ctl_install_type:
28
+
29
+# Path to directory for kolla-ansible source code checkout.
30
+#kolla_ansible_source_path:
31
+
17 32
 # URL of Kolla Ansible source code repository if type is 'source'.
18 33
 #kolla_ansible_source_url:
19 34
 
@@ -21,12 +36,18 @@
21 36
 # is 'source'.
22 37
 #kolla_ansible_source_version:
23 38
 
39
+# Path to virtualenv in which to install kolla-ansible.
40
+#kolla_ansible_venv:
41
+
24 42
 ###############################################################################
25
-# Kolla configuration.
43
+# Kolla & kolla-ansible configuration.
26 44
 
27 45
 # Path to Kolla configuration directory.
28 46
 #kolla_config_path:
29 47
 
48
+# Path to Kolla node custom configuration directory.
49
+#kolla_node_custom_config_path:
50
+
30 51
 # Kolla base container image distribution.
31 52
 #kolla_base_distro:
32 53
 

Loading…
Cancel
Save