Merge "Cleanup sahara/murano/senlin leftovers"

etc/openstack_deploy/env.d/aio_metal.yml.example

@@ -78,9 +78,6 @@ container_skel:
   mistral_container:
     properties:
       is_metal: true
-  murano_container:
-    properties:
-      is_metal: true
   neutron_agents_container:
     properties:
       is_metal: true
@@ -105,9 +102,6 @@ container_skel:
   rabbit_mq_container:
     properties:
       is_metal: true
-  sahara_container:
-    properties:
-      is_metal: true
   swift_remote_container:
     properties:
       is_metal: true

etc/openstack_deploy/user_secrets.yml

@@ -170,21 +170,6 @@ octavia_oslomsg_rpc_password:
 #octavia_oslomsg_notify_password:
 octavia_cert_client_password:
 
-## Sahara Options
-sahara_container_mysql_password:
-sahara_oslomsg_rpc_password:
-#NOTE: Please uncomment those
-# if you want to split rpc and notify users
-# Please also wire the appropriate userid in
-# your user variables.
-#sahara_oslomsg_notify_password:
-sahara_service_password:
-
-
-## Senlin Options:
-senlin_galera_password:
-senlin_oslomsg_rpc_password:
-senlin_service_password:
 
 ## Skyline Options:
 skyline_galera_password:
@@ -225,11 +210,6 @@ mistral_service_password:
 mistral_galera_password:
 mistral_oslomsg_rpc_password:
 
-# Murano Options
-murano_service_password:
-murano_galera_password:
-murano_oslomsg_rpc_password:
-
 ## Rally Options:
 rally_galera_password:
 

inventory/group_vars/utility_all/source_git.yml

@@ -63,10 +63,6 @@ tempest_plugin_manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/mani
 tempest_plugin_manila_git_install_branch: dd1fd2c4ef121eabf3984e6ccd2a7fb3aeae00ba
 tempest_plugin_manila_git_track_branch: master
 
-tempest_plugin_murano_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano-tempest-plugin"
-tempest_plugin_murano_git_install_branch: 528f48107cee6a9d2a120e7e8c94797b3b89bbb8
-tempest_plugin_murano_git_track_branch: master
-
 tempest_plugin_neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-tempest-plugin"
 tempest_plugin_neutron_git_install_branch: b31d56c3d72db84c9b580e7ca13dff6381c08789
 tempest_plugin_neutron_git_track_branch: master
@@ -79,14 +75,6 @@ tempest_plugin_octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/oct
 tempest_plugin_octavia_git_install_branch: afffce19230077433c7c0f7e35b635fd22d18c25
 tempest_plugin_octavia_git_track_branch: master
 
-tempest_plugin_senlin_git_repo: "{{ openstack_opendev_base_url }}/openstack/senlin-tempest-plugin"
-tempest_plugin_senlin_git_install_branch: 83ccfcbeb31517dac620e3786eae085aa851918f
-tempest_plugin_senlin_git_track_branch: master
-
-tempest_plugin_sahara_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara-tests"
-tempest_plugin_sahara_git_install_branch: 3815c917a31398425800001aa79e15114685d01d
-tempest_plugin_sahara_git_track_branch: master
-
 tempest_plugin_telemetry_git_repo: "{{ openstack_opendev_base_url }}/openstack/telemetry-tempest-plugin"
 tempest_plugin_telemetry_git_install_branch: f8a8197b1e1764aecfcd02ae31053b7b96538a6a
 tempest_plugin_telemetry_git_track_branch: master

tests/roles/bootstrap-host/tasks/prepare_aio_config.yml

@@ -172,9 +172,6 @@
     - src: user_variables_manila.yml.j2
       dest: user_variables_manila.yml
       condition: "{{ 'manila' in bootstrap_host_scenarios_expanded }}"
-    - src: user_variables_murano.yml.j2
-      dest: user_variables_murano.yml
-      condition: "{{ 'murano' in bootstrap_host_scenarios_expanded }}"
     - src: user_variables_nfs.yml.j2
       dest: user_variables_nfs.yml
       condition: "{{ 'nfs' in bootstrap_host_scenarios_expanded }}"
@@ -193,9 +190,6 @@
     - src: user_variables_hardening.yml.j2
       dest: user_variables_hardening.yml
       condition: "{{ 'hardening' in bootstrap_host_scenarios_expanded }}"
-    - src: user_variables_sahara.yml.j2
-      dest: user_variables_sahara.yml
-      condition: "{{ 'sahara' in bootstrap_host_scenarios_expanded }}"
     - src: user_variables_stepca.yml.j2
       dest: user_variables_stepca.yml
       condition: "{{ 'stepca' in bootstrap_host_scenarios_expanded }}"

tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2

@@ -230,22 +230,11 @@ magnum_conductor_workers: 1
 venv_wheel_build_enable: false
 {% endif %}
 
-## Sahara
-sahara_api_workers: 1
-sahara_wsgi_threads: 1
-sahara_wsgi_processes: 1
-sahara_wsgi_buffer_size: 16384
-
 ## Zun
 zun_api_threads: 1
 zun_wsgi_threads: 1
 zun_wsgi_processes: 1
 
-## Senlin
-senlin_api_threads: 1
-senlin_wsgi_threads: 1
-senlin_wsgi_processes: 1
-
 # NOTE: hpcloud-b4's eth0 uses 10.0.3.0/24, which overlaps with the
 #       lxc_net_address default
 # TODO: We'll need to implement a mechanism to determine valid lxc_net_address

tests/roles/bootstrap-host/templates/user_variables_murano.yml.j2

@@ -1,30 +0,0 @@
----
-# Copyright 2019, VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-tempest_test_includelist_murano:
-  - murano_tempest_tests.tests.api.application_catalog.test_services
-
-tempest_tempest_conf_overrides_murano:
-  application_catalog:
-    deployment_tests: True
-    endpoint_type: internalURL
-    linux_image: cirros
-
-tempest_flavors:
-  - name: m1.tiny
-    id: 203
-    ram: 256
-    disk: 5
-    vcpus: 1

tests/roles/bootstrap-host/templates/user_variables_sahara.yml.j2

@@ -1,14 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-tempest_test_includelist_sahara:
-  - sahara_tempest_plugin.tests.api.test_job_binary_internals

tests/roles/bootstrap-host/vars/main.yml

@@ -51,20 +51,17 @@ bootstrap_host_scenarios_expanded: |-
   {% if 'ironic' in bootstrap_host_scenarios %}
   {%   set _ = scenario_list.extend(['swift']) %}
   {% endif %}
-  {% if ('magnum' in bootstrap_host_scenarios) or ('sahara' in bootstrap_host_scenarios) %}
+  {% if ('magnum' in bootstrap_host_scenarios) %}
   {%   set _ = scenario_list.extend(['heat'])  %}
   {% endif %}
   {% if 'manila' in bootstrap_host_scenarios %}
   {%   set _ = scenario_list.extend(['ceph'])  %}
   {% endif %}
-  {% if 'murano' in bootstrap_host_scenarios %}
-  {%   set _ = scenario_list.extend(['heat'])  %}
-  {% endif %}
   {% if ['telemetry', 'aodh', 'ceilometer', 'gnocchi'] | intersect(bootstrap_host_scenarios) | length > 0 %}
   {%   set _ = scenario_list.extend(['aodh', 'ceilometer', 'gnocchi']) %}
   {% endif %}
   {% if 'translations' in bootstrap_host_scenarios %}
-  {%   set _ = scenario_list.extend(['designate', 'heat', 'magnum', 'sahara', 'swift', 'trove']) %}
+  {%   set _ = scenario_list.extend(['designate', 'heat', 'magnum', 'swift', 'trove']) %}
   {% endif %}
   {{ (scenario_list | unique) | sort }}