openstack
/
fuel-web
Code Issues Proposed changes

Remove Murano installation from Fuel from box 

Since Fuel 9.0 all functionality for Murano will be moved into
plugin, hence we need remove it from Fuel.

partially implements blueprint murano-fuel-plugin

Change-Id: I553ac31db7609ee568b7a58ab84393722f2dba2d
This commit is contained in:
Denis Egorenko 2016-02-02 15:48:30 +03:00
parent cc501d6013
commit 21fcbbc5ae
12 changed files with 43 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/develop/ostf_contributors_guide.rst
View File

@ -76,7 +76,7 @@ The test docstrings are another important piece and you should always stick to t
- test duration - an estimate of how much a test will take
deployment tags (optional) - gives information about what kind of environment the test will be run, possible values are CENTOS, Ubuntu, RHEL nova_network, Heat, Murano, Sahara)
deployment tags (optional) - gives information about what kind of environment the test will be run, possible values are CENTOS, Ubuntu, RHEL nova_network, Heat, Sahara)
Here's a test example which confirms the above explanations:

8
docs/devops.rst
View File

@ -269,17 +269,13 @@ For more information about how tests work, read the usage information
./utils/jenkins/system_tests.sh -h
Important notes for Sahara and Murano tests
--------------------------------------------
Important notes for Sahara tests
--------------------------------
* It is not recommended to start tests without KVM.
* For the best performance Put Sahara image
`savanna-0.3-vanilla-1.2.1-ubuntu-13.04.qcow2 <http://sahara-files.mirantis.com/savanna-0.3-vanilla-1.2.1-ubuntu-13.04.qcow2>`_
(md5: 9ab37ec9a13bb005639331c4275a308d) in /tmp/ before start, otherwise
(If Internet access is available) the image will download automatically.
* Put Murano image `ubuntu-murano-agent.qcow2 <http://sahara-files.mirantis.com/ubuntu-murano-agent.qcow2>`_
(md5: b0a0fdc0b4a8833f79701eb25e6807a3) in /tmp before start.
* Running Murano tests on instances without an Internet connection will fail.
* For Murano tests execute 'export SLAVE_NODE_MEMORY=5120' before starting.
* If you need an image For Heat autoscale tests check
`prebuilt-jeos-images <https://fedorapeople.org/groups/heat/prebuilt-jeos-images/>`_.

94
nailgun/nailgun/fixtures/openstack.yaml
View File

@ -197,14 +197,6 @@
id: "nova/api"
default_mapping: "management"
properties: *default_network_roles_metadata_properties
-
id: "murano/api"
default_mapping: "management"
properties: *default_network_roles_metadata_properties
-
id: "murano/cfapi"
default_mapping: "management"
properties: *default_network_roles_metadata_properties
-
id: "horizon"
default_mapping: "management"
@ -751,21 +743,6 @@
tenant:
value: "services"
type: "text"
murano_settings:
metadata:
label: "Murano Settings"
weight: 20
group: "openstack_services"
restrictions:
- condition: "settings:additional_components.murano.value == false"
message: "Murano is not enabled on the Additional Components section"
action: "hide"
murano_repo_url:
value: "http://storage.apps.openstack.org/"
label: "Murano Repository URL"
description: ""
weight: 10
type: "text"
external_mongo:
metadata:
label: "External MongoDB"
@ -828,34 +805,6 @@
description: "If selected, Sahara component will be installed"
weight: 10
type: "checkbox"
murano:
value: false
label: "Install Murano"
description: "If selected, Murano component will be installed"
weight: 20
type: "checkbox"
murano-cfapi:
value: false
label: "Install Murano service broker for Cloud Foundry"
description: "If selected, Murano service broker will be installed"
weight: 30
type: "checkbox"
restrictions:
- condition: "settings:additional_components.murano.value == false"
message: "Murano should be enabled"
- condition: "not ('experimental' in version:feature_groups)"
action: "hide"
murano_glance_artifacts_plugin:
value: false
label: "Enable glance artifact repository"
description: "If selected glance artifact repository will be enabled"
weight: 40
type: "checkbox"
restrictions:
- condition: "settings:additional_components.murano.value == false"
message: "Murano should be enabled"
- condition: "not ('experimental' in version:feature_groups)"
action: "hide"
heat:
value: true
label: ""
@ -1309,20 +1258,6 @@
generator: "password"
db_password:
generator: "password"
murano:
user_password:
generator: "password"
rabbit_password:
generator: "password"
db_password:
generator: "password"
murano-cfapi:
user_password:
generator: "password"
rabbit_password:
generator: "password"
db_password:
generator: "password"
heat:
user_password:
generator: "password"
@ -1456,12 +1391,6 @@
description: "dialog.create_cluster_wizard.additional.install_sahara_description"
bind: "settings:additional_components.sahara.value"
weight: 10
murano:
type: "checkbox"
label: "dialog.create_cluster_wizard.additional.install_murano"
description: "dialog.create_cluster_wizard.additional.install_murano_description"
bind: "settings:additional_components.murano.value"
weight: 20
ceilometer:
type: "checkbox"
label: "dialog.create_cluster_wizard.additional.install_ceilometer"
@ -1778,27 +1707,6 @@
weight: 10
label: "dialog.create_cluster_wizard.additional.install_sahara"
description: "dialog.create_cluster_wizard.additional.install_sahara_description"
compatible:
- name: hypervisor:qemu
- name: hypervisor:vmware
- name: network:neutron:core:ml2
- name: network:neutron:ml2:vlan
- name: network:neutron:ml2:tun
- name: storage:block:lvm
- name: storage:block:ceph
- name: storage:object:ceph
- name: storage:ephemeral:ceph
- name: storage:image:ceph
- name: additional_service:sahara
- name: additional_service:murano
- name: additional_service:ceilometer
- name: additional_service:ironic
- name: additional_service:murano
bind:
- "settings:additional_components.murano.value"
weight: 20
label: "dialog.create_cluster_wizard.additional.install_murano"
description: "dialog.create_cluster_wizard.additional.install_murano_description"
compatible:
- name: hypervisor:qemu
- name: hypervisor:vmware
@ -1831,7 +1739,6 @@
- name: storage:ephemeral:ceph
- name: storage:image:ceph
- name: additional_service:sahara
- name: additional_service:murano
- name: additional_service:ironic
- name: additional_service:ironic
bind:
@ -1849,7 +1756,6 @@
- name: storage:ephemeral:ceph
- name: storage:image:ceph
- name: additional_service:sahara
- name: additional_service:murano
- name: additional_service:ceilometer
incompatible:
- name: network:neutron:ml2:tun

8
nailgun/nailgun/orchestrator/base_serializers.py
View File

@ -140,12 +140,12 @@ class MellanoxMixin(object):
class MuranoMetadataSerializerMixin(object):
def generate_test_vm_image_data(self, node):
"""Adds murano metadata to the test image"""
image_data = super(
return self.inject_murano_settings(super(
MuranoMetadataSerializerMixin,
self).generate_test_vm_image_data(node)
self).generate_test_vm_image_data(node))
# Add default Glance property for Murano.
def inject_murano_settings(self, image_data):
"""Adds murano metadata to the test image"""
test_vm_image = image_data['test_vm_image']
existing_properties = test_vm_image['glance_properties']
murano_data = ' '.join(["""--property murano_image_info='{"title":"""

9
nailgun/nailgun/orchestrator/deployment_serializers.py
View File

@ -552,6 +552,12 @@ class DeploymentHASerializer80(DeploymentHASerializer70):
return {'node_volumes': node_extension_call('get_node_volumes', node)}
class DeploymentHASerializer90(DeploymentHASerializer80):
def inject_murano_settings(self, data):
return data
def get_serializer_for_cluster(cluster):
"""Returns a serializer depends on a given `cluster`.
@ -581,6 +587,9 @@ def get_serializer_for_cluster(cluster):
},
'8.0': {
'ha': DeploymentHASerializer80,
},
'9.0': {
'ha': DeploymentHASerializer90,
}
}

18
nailgun/nailgun/settings.yaml
View File

@ -649,24 +649,6 @@ LOGS:
<<: *remote_openstack_log_format
<<: *os_log_group
path: "heat-manage.log"
- id: 'os/murano-api'
name: "murano-api"
<<: *remote_openstack_log_type
<<: *remote_openstack_log_format
<<: *os_log_group
path: "murano-api.log"
- id: 'os/murano-cfapi'
name: "murano-cfapi"
<<: *remote_openstack_log_type
<<: *remote_openstack_log_format
<<: *os_log_group
path: "murano-cfapi.log"
- id: 'os/murano-manage'
name: "murano-manage"
<<: *remote_openstack_log_type
<<: *remote_openstack_log_format
<<: *os_log_group
path: "murano-manage.log"
- id: 'os/sahara-api'
name: "sahara-api"
<<: *remote_openstack_log_type

7
nailgun/nailgun/statistics/fuel_statistics/installation_info.py
View File

@ -102,13 +102,6 @@ class InstallationInfo(object):
WhiteListRule(('additional_components', 'sahara', 'value'),
'sahara', None),
WhiteListRule(('additional_components', 'murano', 'value'),
'murano', None),
WhiteListRule(('additional_components', 'murano-cfapi', 'value'),
'murano-cfapi', None),
WhiteListRule(('additional_components',
'murano_glance_artifacts_plugin', 'value'),
'murano_glance_artifacts_plugin', None),
WhiteListRule(('additional_components', 'heat', 'value'),
'heat', None),
WhiteListRule(('additional_components', 'ceilometer', 'value'),

9
nailgun/nailgun/statistics/fuel_statistics/tasks_params_white_lists.py
View File

@ -147,15 +147,6 @@ _task_output_white_list_template = {
"state_path": ""
},
"priority": "",
"murano": {
"enabled": ""
},
"murano-cfapi": {
"enabled": ""
},
"murano-glance-artifacts-plugin": {
"enabled": ""
},
"role": "",
"online": "",
"auto_assign_floating_ip": "",

25
nailgun/nailgun/test/integration/test_orchestrator_serializer_90.py Normal file
View File

@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Copyright 2015 Mirantis, 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.
from nailgun.test.integration.test_orchestrator_serializer_80 import \
TestDeploymentHASerializer80
class TestDeploymentHASerializer90(TestDeploymentHASerializer80):
env_version = "liberty-9.0"
def test_glance_properties(self):
self.check_no_murano_data()

1
nailgun/nailgun/test/unit/fuel_statistics_tests/test_installation_info.py
View File

@ -399,7 +399,6 @@ class TestInstallationInfo(BaseTestCase):
('workloads_collector', 'user'), ('zabbix', 'password'),
('zabbix', 'username'),
('common', 'use_vcenter'), # removed attribute
('murano_settings', 'murano_repo_url'),
('use_fedora_lt', 'kernel'),
('public_ssl', 'cert_data'), ('public_ssl', 'hostname'),
)

2
nailgun/nailgun/test/unit/test_deployment_serializer.py
View File

@ -97,4 +97,4 @@ class TestGetSerializer(BaseUnitTest):
cluster.release.environment_version = '9999.0'
self.assertIs(
ds.get_serializer_for_cluster(cluster),
ds.DeploymentHASerializer80)
ds.DeploymentHASerializer90)

17
nailgun/static/translations/core.json
View File

@ -909,11 +909,8 @@
"additional": {
"title": "Additional Services",
"release_alert": "Additional services are not available in __NameAndRelease.release_name__",
"network_mode_alert": "Murano requires Neutron as a network option.",
"install_sahara": "Install Sahara",
"install_sahara_description": "Sahara enables on demand provisioning of Hadoop clusters to be deployed on OpenStack utilizing a variety of vendor distributions.",
"install_murano": "Install Murano",
"install_murano_description": "Murano is an application catalog, which allows application developers and cloud administrators to publish various cloud-ready applications in a browsable categorized catalog, which may be used by the cloud users (including the inexperienced ones) to pick-up the needed applications and services and composes the reliable environments out of them in a “push-the-button” manner.",
"install_ceilometer": "Install Ceilometer (OpenStack Telemetry)",
"install_ceilometer_description": "Ceilometer provides metering and monitoring of an OpenStack cloud.",
"install_ironic": "Install Ironic",
@ -1277,10 +1274,6 @@
"label": "安装Sahara",
"description": "如果选择，Sahara组件将被安装。"
},
"murano": {
"label": "安装Murano",
"description": "如果选择，Murano组件将被安装。"
},
"ceilometer": {
"label": "安装Ceilometer",
"description": "如果选择，Ceilometer组件将被安装。"
@ -1510,9 +1503,7 @@
"title": "附加服务",
"release_alert": "__releaseName__不支持附加服务",
"install_sahara": "安装Sahara",
"install_sahara_description": "利用Sahara能在各大版本厂商的OpenStack上的部署Hadoop集群。",
"install_murano": "安装Murano",
"install_murano_description": "利用Murano能将基于Windows的数据中心服务，如活动目录、IIS、Microsoft SQL和ASP.NET部署到OpenStack上。"
"install_sahara_description": "利用Sahara能在各大版本厂商的OpenStack上的部署Hadoop集群。"
},
"ready": {
"title": "完成",
@ -2200,11 +2191,8 @@
"additional": {
"title": "追加サービス",
"release_alert": "追加サービスは __NameAndRelease.release_name__ では使用できません",
"network_mode_alert": "MuranoはネットワークオプションとしてNeutronが必要です。",
"install_sahara": "Saharaのインストール",
"install_sahara_description": "Saharaは様々なベンダーディストリビューションでデプロイされたOpenStack上にHadoopクラスタのオンデマンドプロビジョニングを可能にします。",
"install_murano": "Muranoのインストール",
"install_murano_description": "Muranoはアプリケーションカタログです。アプリケーション開発者およびクラウドの管理者がブラウズ可能なカテゴライズされたカタログの中でさまざまなクラウド対応アプリケーションを公開するために使用されます。これは、クラウド·ユーザー（経験の浅いものを含む）によって使用され、ピックアップするために必要なアプリケーションやサービスを「ボタンを押す」ような操作だけで信頼性の高い環境を構成することができます。",
"install_ceilometer": "Ceilometer(OpenStack テレメトリー)のインストール",
"install_ceilometer_description": "CeilometerはOpenStackクラウドのメータリングおよびモニタリング機能を提供します。"
},
@ -2717,11 +2705,8 @@
"additional": {
"title": "추가 서비스",
"release_alert": "추가 서비스는 __releaseName__에서는 지원되지 않습니다.",
"network_mode_alert": "Murano는 현재의 네트워크 모드에서는 지원되지 않습니다. Murano를 사용하기위해서는 Neutron 네트워크를 선택하십시오.",
"install_sahara": "Sahara 설치",
"install_sahara_description": "Sahara 공급 업체의 다양한 분포를 활용하는 OpenStack에서 배치하는 하둡 클러스터의 on demand 프로비저닝을 가능하게 합니다.",
"install_murano": "Murano 설치",
"install_murano_description": "Murano는 액티브 디렉토리, IIS, 아파치, 마이크로 소프트 SQL 및 ASP.NET와 같은 윈도우나 리눅스 기반의 데이터센터 서비스를 OpenStack에서 배치할 수 있게 합니다.",
"install_ceilometer": "Ceilometer (OpenStack Telemetry) 설치",
"install_ceilometer_description": "Ceilometer는 OpenStack Cloud의 계량 및 모니터링 기능을 제공합니다."
},