Merge "[release] Sync Kolla Ansible inventory for Xena"

ansible/group_vars/all/kolla

@@ -123,8 +123,6 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_blazar | bool }}"
   - regex: ^ceilometer
     enabled: "{{ kolla_enable_ceilometer | bool }}"
-  - regex: ^chrony
-    enabled: "{{ kolla_enable_chrony | bool }}"
   - regex: ^cinder
     enabled: "{{ kolla_enable_cinder | bool }}"
   - regex: ^cloudkitty
@@ -212,8 +210,6 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_ovn | bool }}"
   - regex: ^ovsdpdk
     enabled: "{{ kolla_enable_ovs_dpdk | bool }}"
-  - regex: ^panko
-    enabled: "{{ kolla_enable_panko | bool }}"
   - regex: ^placement
     enabled: "{{ kolla_enable_placement | bool }}"
   - regex: ^prometheus
@@ -222,8 +218,6 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_qdrouterd | bool }}"
   - regex: ^rabbitmq
     enabled: "{{ kolla_enable_rabbitmq | bool }}"
-  - regex: ^rally
-    enabled: "{{ kolla_enable_rally | bool }}"
   - regex: ^redis
     enabled: "{{ kolla_enable_redis | bool }}"
   - regex: ^sahara
@@ -242,8 +236,6 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_tacker | bool }}"
   - regex: ^telegraf
     enabled: "{{ kolla_enable_telegraf | bool }}"
-  - regex: ^tempest
-    enabled: "{{ kolla_enable_tempest | bool }}"
   - regex: ^tgtd
     enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}"
   - regex: ^trove
@@ -522,7 +514,6 @@ kolla_enable_barbican: "no"
 kolla_enable_blazar: "no"
 kolla_enable_ceilometer: "no"
 kolla_enable_central_logging: "no"
-kolla_enable_chrony: "no"
 kolla_enable_cinder: "no"
 kolla_enable_cinder_backend_iscsi: "{{ kolla_enable_cinder_backend_lvm | bool or kolla_enable_cinder_backend_zfssa_iscsi | bool }}"
 kolla_enable_cinder_backend_lvm: "no"
@@ -561,11 +552,9 @@ kolla_enable_openvswitch: "{{ kolla_enable_neutron | bool }}"
 kolla_enable_ovn: "no"
 kolla_enable_ovs_dpdk: "no"
 kolla_enable_osprofiler: "no"
-kolla_enable_panko: "no"
 kolla_enable_placement: "{{ kolla_enable_nova | bool or kolla_enable_zun | bool }}"
 kolla_enable_prometheus: "no"
 kolla_enable_qdrouterd: "no"
-kolla_enable_rally: "no"
 kolla_enable_redis: "no"
 kolla_enable_sahara: "no"
 kolla_enable_senlin: "no"
@@ -575,7 +564,6 @@ kolla_enable_storm: "{{ kolla_enable_monasca | bool }}"
 kolla_enable_swift: "no"
 kolla_enable_tacker: "no"
 kolla_enable_telegraf: "no"
-kolla_enable_tempest: "no"
 kolla_enable_trove: "no"
 kolla_enable_vitrage: "no"
 kolla_enable_vmtp: "no"

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

@@ -209,13 +209,11 @@ kolla_openstack_logging_debug:
 #kolla_enable_neutron_agent_ha:
 #kolla_enable_neutron_vpnaas:
 #kolla_enable_prometheus:
-#kolla_enable_rally:
 #kolla_enable_sahara:
 #kolla_enable_senlin:
 #kolla_enable_storm:
 #kolla_enable_swift:
 #kolla_enable_telegraf:
-#kolla_enable_tempest:
 #kolla_enable_watcher:
 #kolla_enable_zookeeper:
 

ansible/roles/kolla-ansible/templates/kolla/globals.yml

@@ -301,12 +301,6 @@ enable_{{ feature_flag }}: {{ hostvars[inventory_hostname]['kolla_enable_' ~ fea
 #barbican_crypto_plugin: "simple_crypto"
 #barbican_library_path: "/usr/lib/libCryptoki2_64.so"
 
-################
-## Panko options
-################
-# Valid options are [ mysql ]
-#panko_database_type: "mysql"
-
 #################
 # Gnocchi options
 #################
@@ -452,19 +446,6 @@ ironic_inspector_kernel_cmdline_extras:
 # Rolling upgrade were enable by default
 #swift_enable_rolling_upgrade: "yes"
 
-
-################################################
-# Tempest - The OpenStack Integration Test Suite
-################################################
-# The following values must be set when enabling tempest
-#tempest_image_id:
-#tempest_flavor_ref_id:
-#tempest_public_network_id:
-#tempest_floating_network_name:
-
-# tempest_image_alt_id: "{% raw %}{{ tempest_image_id }}{% endraw %}"
-# tempest_flavor_ref_alt_id: "{% raw %}{{ tempest_flavor_ref_id }}{% endraw %}"
-
 ###################################
 # VMware - OpenStack VMware support
 ###################################

ansible/roles/kolla-ansible/templates/overcloud-components.j2

@@ -25,16 +25,6 @@ compute
 storage
 monitoring
 
-[chrony-server:children]
-loadbalancer
-
-[chrony:children]
-control
-network
-compute
-storage
-monitoring
-
 [collectd:children]
 compute
 
@@ -172,9 +162,6 @@ control
 control
 compute
 
-[panko:children]
-control
-
 [gnocchi:children]
 control
 
@@ -184,10 +171,6 @@ control
 [trove:children]
 control
 
-# Tempest
-[tempest:children]
-control
-
 [senlin:children]
 control
 
@@ -200,9 +183,6 @@ control
 [watcher:children]
 control
 
-[rally:children]
-control
-
 [octavia:children]
 control
 

ansible/roles/kolla-ansible/templates/overcloud-services.j2

@@ -345,10 +345,6 @@ compute
 [cyborg-conductor:children]
 cyborg
 
-# Panko
-[panko-api:children]
-panko
-
 # Gnocchi
 [gnocchi-api:children]
 gnocchi

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

@@ -132,7 +132,6 @@
             kolla_enable_blazar: True
             kolla_enable_ceilometer: True
             kolla_enable_central_logging: True
-            kolla_enable_chrony: True
             kolla_enable_cinder: True
             kolla_enable_cinder_backend_hnas_iscsi: True
             kolla_enable_cinder_backend_hnas_nfs: True
@@ -173,9 +172,7 @@
             kolla_enable_nova_serialconsole_proxy: True
             kolla_enable_octavia: True
             kolla_enable_osprofiler: True
-            kolla_enable_panko: True
             kolla_enable_prometheus: True
-            kolla_enable_rally: True
             kolla_enable_sahara: True
             kolla_enable_senlin: True
             kolla_enable_skydive: True
@@ -184,7 +181,6 @@
             kolla_enable_swift: True
             kolla_enable_tacker: True
             kolla_enable_telegraf: True
-            kolla_enable_tempest: True
             kolla_enable_trove: True
             kolla_enable_watcher: True
             kolla_enable_zookeeper: True
@@ -260,7 +256,6 @@
               #enable_blazar: True
               #enable_ceilometer: True
               #enable_central_logging: True
-              #enable_chrony: True
               #enable_cinder: True
               #enable_cinder_backend_iscsi: True
               #enable_cinder_backend_hnas_iscsi: True
@@ -301,9 +296,7 @@
               #enable_nova_serialconsole_proxy: True
               #enable_octavia: True
               #enable_osprofiler: True
-              #enable_panko: True
               #enable_prometheus: True
-              #enable_rally: True
               #enable_sahara: True
               #enable_skydive: True
               #enable_solum: True
@@ -312,7 +305,6 @@
               #enable_swift: True
               #enable_tacker: True
               #enable_telegraf: True
-              #enable_tempest: True
               #enable_trove: True
               #enable_watcher: True
               #enable_zookeeper: True

ansible/time.yml

@@ -21,7 +21,6 @@
       run_once: true
       when:
         - "'ntp' not in groups"
-        - not kolla_enable_chrony | bool
 
 - name: Ensure Chrony is installed and configured
   hosts: ntp
@@ -30,4 +29,3 @@
   tasks:
     - import_role:
         name: ntp
-      when: not kolla_enable_chrony | bool