diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index c7babf23e9..7b58a0cc1c 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -173,12 +173,6 @@ version: master trackbranch: master shallow_since: '2023-12-06' -- name: os_murano - scm: git - src: https://opendev.org/openstack/openstack-ansible-os_murano - version: master - trackbranch: master - shallow_since: '2023-12-06' - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron @@ -209,18 +203,6 @@ version: master trackbranch: master shallow_since: '2023-12-06' -- name: os_sahara - scm: git - src: https://opendev.org/openstack/openstack-ansible-os_sahara - version: master - trackbranch: master - shallow_since: '2023-12-06' -- name: os_senlin - scm: git - src: https://opendev.org/openstack/openstack-ansible-os_senlin - version: master - trackbranch: master - shallow_since: '2023-12-06' - name: os_swift scm: git src: https://opendev.org/openstack/openstack-ansible-os_swift diff --git a/deploy-guide/source/configure.rst b/deploy-guide/source/configure.rst index dfdd5a3a0f..c822eba1ae 100644 --- a/deploy-guide/source/configure.rst +++ b/deploy-guide/source/configure.rst @@ -162,8 +162,6 @@ OpenStack service roles - :role_docs:`os_mistral ` -- :role_docs:`os_murano ` - - :role_docs:`os_neutron ` - :role_docs:`os_nova ` @@ -174,10 +172,6 @@ OpenStack service roles - :role_docs:`os_rally ` -- :role_docs:`os_sahara ` - -- :role_docs:`os_senlin ` - - :role_docs:`os_swift ` - :role_docs:`os_tacker ` diff --git a/etc/openstack_deploy/conf.d/murano.yml.aio b/etc/openstack_deploy/conf.d/murano.yml.aio deleted file mode 100644 index 15098977dc..0000000000 --- a/etc/openstack_deploy/conf.d/murano.yml.aio +++ /dev/null @@ -1,3 +0,0 @@ -murano-infra_hosts: - aio1: - ip: 172.29.236.100 diff --git a/etc/openstack_deploy/conf.d/murano.yml.example b/etc/openstack_deploy/conf.d/murano.yml.example deleted file mode 100644 index 3f2be53d51..0000000000 --- a/etc/openstack_deploy/conf.d/murano.yml.example +++ /dev/null @@ -1,8 +0,0 @@ -# The infra nodes that will be running the murano services -murano-infra_hosts: - infra1: - ip: 172.20.236.111 - infra2: - ip: 172.20.236.112 - infra3: - ip: 172.20.236.113 diff --git a/etc/openstack_deploy/conf.d/sahara.yml.aio b/etc/openstack_deploy/conf.d/sahara.yml.aio deleted file mode 100644 index 70236ec9dd..0000000000 --- a/etc/openstack_deploy/conf.d/sahara.yml.aio +++ /dev/null @@ -1,16 +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. - -sahara-infra_hosts: - aio1: - ip: 172.29.236.100 diff --git a/etc/openstack_deploy/conf.d/senlin.yml.aio b/etc/openstack_deploy/conf.d/senlin.yml.aio deleted file mode 100644 index 6a6b428103..0000000000 --- a/etc/openstack_deploy/conf.d/senlin.yml.aio +++ /dev/null @@ -1,4 +0,0 @@ -# The controller host that the senlin control plane will be run on -senlin-infra_hosts: - aio1: - ip: 172.29.236.100 diff --git a/etc/openstack_deploy/conf.d/senlin.yml.example b/etc/openstack_deploy/conf.d/senlin.yml.example deleted file mode 100644 index 192ee8ad00..0000000000 --- a/etc/openstack_deploy/conf.d/senlin.yml.example +++ /dev/null @@ -1,8 +0,0 @@ -# The infra nodes that will be running the senlin services -senlin-infra_hosts: - infra1: - ip: 172.20.236.111 - infra2: - ip: 172.20.236.112 - infra3: - ip: 172.20.236.113 diff --git a/inventory/env.d/murano.yml b/inventory/env.d/murano.yml deleted file mode 100644 index 22a10308f5..0000000000 --- a/inventory/env.d/murano.yml +++ /dev/null @@ -1,38 +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. - -component_skel: - murano_api: - belongs_to: - - murano_all - murano_engine: - belongs_to: - - murano_all - -container_skel: - murano_container: - belongs_to: - - murano-infra_containers - contains: - - murano_api - - murano_engine - -physical_skel: - murano-infra_containers: - belongs_to: - - all_containers - murano-infra_hosts: - belongs_to: - - hosts diff --git a/inventory/env.d/sahara.yml b/inventory/env.d/sahara.yml deleted file mode 100644 index f3c62e10b9..0000000000 --- a/inventory/env.d/sahara.yml +++ /dev/null @@ -1,36 +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. - -component_skel: - sahara_api: - belongs_to: - - sahara_all - sahara_engine: - belongs_to: - - sahara_all - -container_skel: - sahara_container: - belongs_to: - - sahara-infra_containers - contains: - - sahara_api - - sahara_engine - -physical_skel: - sahara-infra_containers: - belongs_to: - - all_containers - sahara-infra_hosts: - belongs_to: - - hosts diff --git a/inventory/env.d/senlin.yml b/inventory/env.d/senlin.yml deleted file mode 100644 index 924f46f3ea..0000000000 --- a/inventory/env.d/senlin.yml +++ /dev/null @@ -1,31 +0,0 @@ -component_skel: - senlin_api: - belongs_to: - - senlin_all - senlin_engine: - belongs_to: - - senlin_all - senlin_conductor: - belongs_to: - - senlin_all - senlin_health_manager: - belongs_to: - - senlin_all - -container_skel: - senlin_container: - belongs_to: - - senlin-infra_containers - contains: - - senlin_api - - senlin_engine - - senlin_conductor - - senlin_health_manager - -physical_skel: - senlin-infra_containers: - belongs_to: - - all_containers - senlin-infra_hosts: - belongs_to: - - hosts diff --git a/inventory/group_vars/murano_all/source_git.yml b/inventory/group_vars/murano_all/source_git.yml deleted file mode 100644 index 3447cfa273..0000000000 --- a/inventory/group_vars/murano_all/source_git.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# Copyright 2023, Cleura AB -# -# 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. - -### HEAD as of 13.12.2023 ### - -## Murano service -murano_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano" -murano_git_install_branch: c898a310afbc27f12190446ef75d8b0bd12115eb -murano_git_track_branch: master diff --git a/inventory/group_vars/sahara_all/source_git.yml b/inventory/group_vars/sahara_all/source_git.yml deleted file mode 100644 index 9cd288fe4b..0000000000 --- a/inventory/group_vars/sahara_all/source_git.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# Copyright 2023, Cleura AB -# -# 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. - -### HEAD as of 13.12.2023 ### - -## Sahara service -sahara_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara" -sahara_git_install_branch: 0947762d5235654314dbac809b8cc837bd2f3409 -sahara_git_track_branch: master diff --git a/inventory/group_vars/utility_all/defaults.yml b/inventory/group_vars/utility_all/defaults.yml index 103b5beaac..14ffae2b13 100644 --- a/inventory/group_vars/utility_all/defaults.yml +++ b/inventory/group_vars/utility_all/defaults.yml @@ -43,7 +43,6 @@ utility_devel_distro_packages: "{{ (ansible_facts['os_family'] == 'RedHat') | te utility_distro_openstack_clients_packages: - python3-keystoneclient - python3-cinderclient - - python3-muranoclient - python3-neutronclient - python3-novaclient - python3-openstackclient diff --git a/inventory/inventory.ini b/inventory/inventory.ini index e62cc4cf52..a631d6e7f1 100644 --- a/inventory/inventory.ini +++ b/inventory/inventory.ini @@ -168,12 +168,6 @@ mistral_notifier [mistral_executor] [mistral_notifier] -[murano_all:children] -murano_api -murano_engine -[murano_api] -[murano_engine] - [neutron_all:children] ironic_neutron_agent neutron_agent @@ -226,22 +220,6 @@ nova_scheduler placement_api [placement_api] -[sahara_all:children] -sahara_api -sahara_engine -[sahara_api] -[sahara_engine] - -[senlin_all:children] -senlin_api -senlin_engine -senlin_conductor -senlin_health_manager -[senlin_api] -[senlin_engine] -[senlin_conductor] -[senlin_health_manager] - [swift_all:children] swift_acc swift_cont diff --git a/playbooks/os-murano-install.yml b/playbooks/os-murano-install.yml deleted file mode 100644 index c8248130f3..0000000000 --- a/playbooks/os-murano-install.yml +++ /dev/null @@ -1,86 +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. - -- name: Gather murano facts - hosts: murano_all - gather_facts: "{{ osa_gather_facts | default(True) }}" - tasks: - - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" - when: osa_gather_facts | default(True) - tags: - - always - -- name: Configure haproxy services - import_playbook: openstack.osa.haproxy_service_config - vars: - service_group: murano_api - service_variable: "murano_haproxy_services" - when: groups[service_group] | length > 0 - tags: - - haproxy-service-config - -- name: Install murano components - hosts: murano_all - gather_facts: false - serial: "{{ murano_serial | default(['1','100%']) }}" - environment: "{{ deployment_environment_variables | default({}) }}" - user: root - vars_files: - - "defaults/{{ install_method }}_install.yml" - tags: - - murano - pre_tasks: - # In order to ensure that any container, software or - # config file changes which causes a container/service - # restart do not cause an unexpected outage, we drain - # the load balancer back end for this container. - - name: Disabling haproxy backends - include_tasks: common-tasks/haproxy-endpoint-manage.yml - vars: - haproxy_backend: murano-back - haproxy_state: disabled - when: - - "'murano_all' in group_names" - - "groups['murano_all'] | length > 1" - - - name: Including container-setup tasks - include_role: - name: "openstack.osa.{{ container_tech | default('lxc') }}_container_setup" - when: not is_metal - - - name: Including unbound-clients tasks - include_tasks: common-tasks/unbound-clients.yml - when: - - hostvars['localhost']['resolvconf_enabled'] | bool - - roles: - - role: "os_murano" - - role: "openstack.osa.system_crontab_coordination" - tags: - - crontab - - post_tasks: - # Now that container changes are done, we can set - # the load balancer back end for this container - # to available again. - - name: Enabling haproxy backends - include_tasks: common-tasks/haproxy-endpoint-manage.yml - vars: - haproxy_backend: murano-back - haproxy_state: enabled - when: - - "'murano_all' in group_names" - - "groups['murano_all'] | length > 1" diff --git a/playbooks/os-sahara-install.yml b/playbooks/os-sahara-install.yml deleted file mode 100644 index dbd84ade17..0000000000 --- a/playbooks/os-sahara-install.yml +++ /dev/null @@ -1,80 +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. - -- name: Gather sahara facts - hosts: sahara_all - gather_facts: "{{ osa_gather_facts | default(True) }}" - tasks: - - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" - when: osa_gather_facts | default(True) - tags: - - always - -- name: Configure haproxy services - import_playbook: openstack.osa.haproxy_service_config - vars: - service_group: sahara_api - service_variable: "sahara_haproxy_services" - when: groups[service_group] | length > 0 - tags: - - haproxy-service-config - -- name: Install sahara server - hosts: sahara_all - gather_facts: "{{ osa_gather_facts | default(True) }}" - serial: "{{ sahara_serial | default(['1','100%']) }}" - user: root - environment: "{{ deployment_environment_variables | default({}) }}" - vars_files: - - "defaults/{{ install_method }}_install.yml" - tags: - - sahara - pre_tasks: - # In order to ensure that any container, software or - # config file changes which causes a container/service - # restart do not cause an unexpected outage, we drain - # the load balancer back end for this container. - - name: Disabling haproxy backends - include_tasks: common-tasks/haproxy-endpoint-manage.yml - vars: - haproxy_backend: sahara_api-back - haproxy_state: disabled - when: - - "'sahara_api' in group_names" - - "groups['sahara_api'] | length > 1" - - - name: Including container-setup tasks - include_role: - name: "openstack.osa.{{ container_tech | default('lxc') }}_container_setup" - when: not is_metal - - - name: Including unbound-clients tasks - include_tasks: common-tasks/unbound-clients.yml - when: - - hostvars['localhost']['resolvconf_enabled'] | bool - roles: - - role: "os_sahara" - - post_tasks: - # Now that container changes are done, we can set - # the load balancer back end for this container - # to available again. - - name: Enabling haproxy backends - include_tasks: common-tasks/haproxy-endpoint-manage.yml - vars: - haproxy_backend: sahara_api-back - haproxy_state: enabled - when: - - "'sahara_api' in group_names" - - "groups['sahara_api'] | length > 1" diff --git a/playbooks/os-senlin-install.yml b/playbooks/os-senlin-install.yml deleted file mode 100644 index 0e2165b855..0000000000 --- a/playbooks/os-senlin-install.yml +++ /dev/null @@ -1,78 +0,0 @@ ---- -# Copyright 2020, City Network International AB -# -# 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. - -- name: Gather senlin facts - hosts: senlin_all - gather_facts: "{{ osa_gather_facts | default(True) }}" - tasks: - - name: Gather additional facts - include_tasks: "common-tasks/gather-hardware-facts.yml" - when: osa_gather_facts | default(True) - tags: - - always - -- name: Configure haproxy services - import_playbook: openstack.osa.haproxy_service_config - vars: - service_group: senlin_api - service_variable: "senlin_haproxy_services" - when: groups[service_group] | length > 0 - tags: - - haproxy-service-config - -- name: Install senlin services - hosts: senlin_all - gather_facts: false - serial: "{{ senlin_serial | default(['1','100%']) }}" - user: root - environment: "{{ deployment_environment_variables | default({}) }}" - vars_files: - - "defaults/{{ install_method }}_install.yml" - tags: - - senlin - pre_tasks: - # In order to ensure that any container, software or - # config file changes which causes a container/service - # restart do not cause an unexpected outage, we drain - # the load balancer back end for this container. - - name: Disabling haproxy backends - include_tasks: common-tasks/haproxy-endpoint-manage.yml - vars: - haproxy_backend: senlin_api-back - haproxy_state: disabled - when: - - "'senlin_api' in group_names" - - "groups['senlin_api'] | length > 1" - - - name: Including unbound-clients tasks - include_tasks: common-tasks/unbound-clients.yml - when: - - hostvars['localhost']['resolvconf_enabled'] | bool - - roles: - - role: "os_senlin" - - post_tasks: - # Now that container changes are done, we can set - # the load balancer back end for this container - # to available again. - - name: Enabling haproxy backends - include_tasks: common-tasks/haproxy-endpoint-manage.yml - vars: - haproxy_backend: senlin_api-back - haproxy_state: enabled - when: - - "'senlin_api' in group_names" - - "groups['senlin_api'] | length > 1" diff --git a/playbooks/setup-openstack.yml b/playbooks/setup-openstack.yml index d0bdac97fc..02ae0a03a8 100644 --- a/playbooks/setup-openstack.yml +++ b/playbooks/setup-openstack.yml @@ -73,12 +73,6 @@ - name: Importing os-trove-install playbook import_playbook: os-trove-install.yml -- name: Importing os-sahara-install playbook - import_playbook: os-sahara-install.yml - -- name: Importing os-senlin-install playbook - import_playbook: os-senlin-install.yml - - name: Importing os-octavia-install playbook import_playbook: os-octavia-install.yml @@ -97,9 +91,6 @@ - name: Importing os-mistral-install playbook import_playbook: os-mistral-install.yml -- name: Importing os-murano-install playbook - import_playbook: os-murano-install.yml - - name: Importing os-zun-install playbook import_playbook: os-zun-install.yml diff --git a/releasenotes/notes/murano_sahara_senlin_inactive-cd24a198e5205461.yaml b/releasenotes/notes/murano_sahara_senlin_inactive-cd24a198e5205461.yaml new file mode 100644 index 0000000000..2dffae616b --- /dev/null +++ b/releasenotes/notes/murano_sahara_senlin_inactive-cd24a198e5205461.yaml @@ -0,0 +1,33 @@ +--- + +upgrade: + - | + Services, that were makred as Inactive (Murano, Senlin, Sahara) will not be + upgraded as they were not released for 2024.1 (Caracal). + In order to keep managing these services on older versions you will need to + do following actions: + + * Create file /etc/openstack_deploy/user-role-requirements.yml with following content: + + .. code-block:: yaml + + - name: os_ + scm: git + src: https://opendev.org/openstack/openstack-ansible-os_ + version: master + trackbranch: master + + * Playbooks for managing services can be found inside role examples, ie: ``/etc/ansible/roles/os_/examples/playbook.yml`` + + * Services will remain in your previously generated inventory until you explicitly remove them. + +deprecations: + - | + Following roles are not going to be part of 2024.1 release due to services + being trafered to `Inactive state `_: + - Murano + - Senlin + - Sahara + + Playbooks for managing these services were also removed out of the tree + and can be found only under specific role `examples` folder. diff --git a/tests/test_inventory.py b/tests/test_inventory.py index 4b9b167fe1..cbabcd19c4 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -316,13 +316,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'mistral_engine', 'mistral_executor', 'mistral_notifier', - 'murano-infra_all', - 'murano-infra_containers', - 'murano-infra_hosts', - 'murano_all', - 'murano_container', - 'murano_api', - 'murano_engine', 'mano_all', 'mano_containers', 'mano_hosts', @@ -440,22 +433,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'repo-infra_all', 'repo_all', 'repo_container', - 'sahara-infra_all', - 'sahara-infra_containers', - 'sahara-infra_hosts', - 'sahara_all', - 'sahara_api', - 'sahara_container', - 'sahara_engine', - 'senlin-infra_all', - 'senlin-infra_containers', - 'senlin-infra_hosts', - 'senlin_all', - 'senlin_api', - 'senlin_container', - 'senlin_engine', - 'senlin_conductor', - 'senlin_health_manager', 'skyline', 'skyline_all', 'skyline_container',