From 41191f49d7d63bb206eda97ef5a795ce2057e7d3 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 31 Jul 2018 19:42:36 +0100 Subject: [PATCH] Remove the molteniron service from the integrated build The molteniron service appears to be largely for testing purposes and both the service and role have not had much activity for over a year. As such, it is removed from OSA's integrated build. Change-Id: I94b1be326935f7006027b4a437ff3b2b0a6f9a69 --- ansible-role-requirements.yml | 4 --- .../conf.d/molteniron.yml.aio | 4 --- .../env.d/aio_metal.yml.example | 3 -- etc/openstack_deploy/user_secrets.yml | 3 -- inventory/env.d/molteniron.yml | 35 ------------------- inventory/inventory.ini | 2 -- playbooks/defaults/distro_install.yml | 1 - .../repo_packages/openstack_services.yml | 6 ---- playbooks/setup-openstack.yml | 1 - ...lteniron-deprecation-87ee6f12a3dcb1e8.yaml | 7 ++++ tests/test_inventory.py | 6 ---- 11 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 etc/openstack_deploy/conf.d/molteniron.yml.aio delete mode 100644 inventory/env.d/molteniron.yml create mode 100644 releasenotes/notes/molteniron-deprecation-87ee6f12a3dcb1e8.yaml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index a2226fa3d1..c08692f793 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -102,10 +102,6 @@ scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_magnum version: master -- name: os_molteniron - scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron - version: master - name: os_neutron scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_neutron diff --git a/etc/openstack_deploy/conf.d/molteniron.yml.aio b/etc/openstack_deploy/conf.d/molteniron.yml.aio deleted file mode 100644 index 76397900f6..0000000000 --- a/etc/openstack_deploy/conf.d/molteniron.yml.aio +++ /dev/null @@ -1,4 +0,0 @@ ---- -molteniron-server_hosts: - aio1: - ip: 172.29.236.100 diff --git a/etc/openstack_deploy/env.d/aio_metal.yml.example b/etc/openstack_deploy/env.d/aio_metal.yml.example index af6674e6c2..6a935ab9c3 100644 --- a/etc/openstack_deploy/env.d/aio_metal.yml.example +++ b/etc/openstack_deploy/env.d/aio_metal.yml.example @@ -75,9 +75,6 @@ container_skel: memcached_container: properties: is_metal: true - molteniron-server_container: - properties: - is_metal: true neutron_agents_container: properties: is_metal: true diff --git a/etc/openstack_deploy/user_secrets.yml b/etc/openstack_deploy/user_secrets.yml index dcb8f34770..8e2dfb8651 100644 --- a/etc/openstack_deploy/user_secrets.yml +++ b/etc/openstack_deploy/user_secrets.yml @@ -228,9 +228,6 @@ designate_oslomsg_rpc_password: #designate_oslomsg_notify_password: designate_service_password: -## Molteniron Options: -molteniron_container_mysql_password: - ## Tacker options tacker_oslomsg_rpc_password: #NOTE: Please uncomment those diff --git a/inventory/env.d/molteniron.yml b/inventory/env.d/molteniron.yml deleted file mode 100644 index 5f15443df3..0000000000 --- a/inventory/env.d/molteniron.yml +++ /dev/null @@ -1,35 +0,0 @@ ---- -# Copyright (c) 2017 IBM Corporation. -# -# 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: - molteniron: - belongs_to: - - molteniron_all - -container_skel: - molteniron-server_container: - belongs_to: - - molteniron-server_containers - contains: - - molteniron - -physical_skel: - molteniron-server_containers: - belongs_to: - - all_containers - molteniron-server_hosts: - belongs_to: - - hosts diff --git a/inventory/inventory.ini b/inventory/inventory.ini index 8c26d8f345..df0deb4cf9 100644 --- a/inventory/inventory.ini +++ b/inventory/inventory.ini @@ -125,8 +125,6 @@ ironic_server [magnum_all] -[molteniron_all] - [neutron_all:children] neutron_agent neutron_bgp_dragent diff --git a/playbooks/defaults/distro_install.yml b/playbooks/defaults/distro_install.yml index 3140a3b3cf..ff229c1535 100644 --- a/playbooks/defaults/distro_install.yml +++ b/playbooks/defaults/distro_install.yml @@ -44,7 +44,6 @@ keystone_install_method: distro keystone_bin: /usr/bin magnum_install_method: distro masakari_install_method: distro -molteniron_install_method: distro monasca_install_method: distro monasca-agent_install_method: distro monasca-ui_install_method: distro diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 94393176db..7c2f0ab0d0 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -236,12 +236,6 @@ octavia_git_install_branch: a52d7c6ef930133efde9d5a22ecca5f26e4cfc92 # HEAD of " octavia_git_project_group: octavia_all -## Molteniron service -molteniron_git_repo: https://git.openstack.org/openstack/molteniron -molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 03.07.2018 -molteniron_git_project_group: molteniron_all - - ## Tacker service tacker_git_repo: https://git.openstack.org/openstack/tacker tacker_git_install_branch: 7d0c22524ac8352a50af2e017eed4b5be28d4c31 # HEAD of "master" as of 03.07.2018 diff --git a/playbooks/setup-openstack.yml b/playbooks/setup-openstack.yml index d25bd47607..63ebca5105 100644 --- a/playbooks/setup-openstack.yml +++ b/playbooks/setup-openstack.yml @@ -37,7 +37,6 @@ - include: os-magnum-install.yml - include: os-trove-install.yml - include: os-sahara-install.yml -- include: os-molteniron-install.yml - include: os-octavia-install.yml - include: os-tacker-install.yml diff --git a/releasenotes/notes/molteniron-deprecation-87ee6f12a3dcb1e8.yaml b/releasenotes/notes/molteniron-deprecation-87ee6f12a3dcb1e8.yaml new file mode 100644 index 0000000000..6d1733242c --- /dev/null +++ b/releasenotes/notes/molteniron-deprecation-87ee6f12a3dcb1e8.yaml @@ -0,0 +1,7 @@ +--- +deprecations: + - | + The ``molteniron`` service is no longer included in the OSA + integrated build. Any deployers wishing to use it may still + use the playbook and configuration examples from the + ``os_molteniron`` role. diff --git a/tests/test_inventory.py b/tests/test_inventory.py index 42941b8665..0d1641ecf4 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -316,12 +316,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'metrics_all', 'metrics_containers', 'metrics_hosts', - 'molteniron', - 'molteniron-server_all', - 'molteniron-server_containers', - 'molteniron-server_container', - 'molteniron-server_hosts', - 'molteniron_all', 'mq_containers', 'mq_hosts', 'network_all',