Revert "Remove Murano installation from Fuel from box"
This partially reverts commit 21fcbbc5ae
.
This patch reverts only python part.
The new way of removing Murano is described here:
https://review.openstack.org/275124
Change-Id: I24643c06fbd5b578d6ea75cca44128623204b5ce
This commit is contained in:
parent
1c7335a726
commit
271e548ed7
|
@ -379,6 +379,14 @@ Important notes for Sahara tests
|
||||||
`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>`_
|
`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
|
(md5: 9ab37ec9a13bb005639331c4275a308d) in /tmp/ before start, otherwise
|
||||||
(If Internet access is available) the image will download automatically.
|
(If Internet access is available) the image will download automatically.
|
||||||
|
|
||||||
|
Important notes for Murano tests
|
||||||
|
--------------------------------
|
||||||
|
* Murano is deprecated in Fuel 9.0.
|
||||||
|
* 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
|
* If you need an image For Heat autoscale tests check
|
||||||
`prebuilt-jeos-images <https://fedorapeople.org/groups/heat/prebuilt-jeos-images/>`_.
|
`prebuilt-jeos-images <https://fedorapeople.org/groups/heat/prebuilt-jeos-images/>`_.
|
||||||
|
|
||||||
|
|
|
@ -208,6 +208,14 @@
|
||||||
id: "nova/api"
|
id: "nova/api"
|
||||||
default_mapping: "management"
|
default_mapping: "management"
|
||||||
properties: *default_network_roles_metadata_properties
|
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"
|
id: "horizon"
|
||||||
default_mapping: "management"
|
default_mapping: "management"
|
||||||
|
@ -815,6 +823,21 @@
|
||||||
tenant:
|
tenant:
|
||||||
value: "services"
|
value: "services"
|
||||||
type: "text"
|
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:
|
external_mongo:
|
||||||
metadata:
|
metadata:
|
||||||
label: "External MongoDB"
|
label: "External MongoDB"
|
||||||
|
@ -877,6 +900,34 @@
|
||||||
description: "If selected, Sahara component will be installed"
|
description: "If selected, Sahara component will be installed"
|
||||||
weight: 10
|
weight: 10
|
||||||
type: "checkbox"
|
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:
|
heat:
|
||||||
value: true
|
value: true
|
||||||
label: ""
|
label: ""
|
||||||
|
@ -1334,6 +1385,20 @@
|
||||||
generator: "password"
|
generator: "password"
|
||||||
db_password:
|
db_password:
|
||||||
generator: "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:
|
heat:
|
||||||
user_password:
|
user_password:
|
||||||
generator: "password"
|
generator: "password"
|
||||||
|
@ -1674,6 +1739,27 @@
|
||||||
weight: 10
|
weight: 10
|
||||||
label: "dialog.create_cluster_wizard.additional.install_sahara"
|
label: "dialog.create_cluster_wizard.additional.install_sahara"
|
||||||
description: "dialog.create_cluster_wizard.additional.install_sahara_description"
|
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:
|
compatible:
|
||||||
- name: hypervisor:qemu
|
- name: hypervisor:qemu
|
||||||
- name: hypervisor:vmware
|
- name: hypervisor:vmware
|
||||||
|
@ -1706,6 +1792,7 @@
|
||||||
- name: storage:ephemeral:ceph
|
- name: storage:ephemeral:ceph
|
||||||
- name: storage:image:ceph
|
- name: storage:image:ceph
|
||||||
- name: additional_service:sahara
|
- name: additional_service:sahara
|
||||||
|
- name: additional_service:murano
|
||||||
- name: additional_service:ironic
|
- name: additional_service:ironic
|
||||||
- name: additional_service:ironic
|
- name: additional_service:ironic
|
||||||
bind:
|
bind:
|
||||||
|
@ -1723,6 +1810,7 @@
|
||||||
- name: storage:ephemeral:ceph
|
- name: storage:ephemeral:ceph
|
||||||
- name: storage:image:ceph
|
- name: storage:image:ceph
|
||||||
- name: additional_service:sahara
|
- name: additional_service:sahara
|
||||||
|
- name: additional_service:murano
|
||||||
- name: additional_service:ceilometer
|
- name: additional_service:ceilometer
|
||||||
incompatible:
|
incompatible:
|
||||||
- name: network:neutron:ml2:tun
|
- name: network:neutron:ml2:tun
|
||||||
|
|
|
@ -647,6 +647,24 @@ LOGS:
|
||||||
<<: *remote_openstack_log_format
|
<<: *remote_openstack_log_format
|
||||||
<<: *os_log_group
|
<<: *os_log_group
|
||||||
path: "heat-manage.log"
|
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'
|
- id: 'os/sahara-api'
|
||||||
name: "sahara-api"
|
name: "sahara-api"
|
||||||
<<: *remote_openstack_log_type
|
<<: *remote_openstack_log_type
|
||||||
|
|
|
@ -102,6 +102,13 @@ class InstallationInfo(object):
|
||||||
|
|
||||||
WhiteListRule(('additional_components', 'sahara', 'value'),
|
WhiteListRule(('additional_components', 'sahara', 'value'),
|
||||||
'sahara', None),
|
'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'),
|
WhiteListRule(('additional_components', 'heat', 'value'),
|
||||||
'heat', None),
|
'heat', None),
|
||||||
WhiteListRule(('additional_components', 'ceilometer', 'value'),
|
WhiteListRule(('additional_components', 'ceilometer', 'value'),
|
||||||
|
|
|
@ -147,6 +147,15 @@ _task_output_white_list_template = {
|
||||||
"state_path": ""
|
"state_path": ""
|
||||||
},
|
},
|
||||||
"priority": "",
|
"priority": "",
|
||||||
|
"murano": {
|
||||||
|
"enabled": ""
|
||||||
|
},
|
||||||
|
"murano-cfapi": {
|
||||||
|
"enabled": ""
|
||||||
|
},
|
||||||
|
"murano-glance-artifacts-plugin": {
|
||||||
|
"enabled": ""
|
||||||
|
},
|
||||||
"role": "",
|
"role": "",
|
||||||
"online": "",
|
"online": "",
|
||||||
"auto_assign_floating_ip": "",
|
"auto_assign_floating_ip": "",
|
||||||
|
|
|
@ -399,6 +399,7 @@ class TestInstallationInfo(BaseTestCase):
|
||||||
('workloads_collector', 'user'), ('zabbix', 'password'),
|
('workloads_collector', 'user'), ('zabbix', 'password'),
|
||||||
('zabbix', 'username'),
|
('zabbix', 'username'),
|
||||||
('common', 'use_vcenter'), # removed attribute
|
('common', 'use_vcenter'), # removed attribute
|
||||||
|
('murano_settings', 'murano_repo_url'),
|
||||||
('use_fedora_lt', 'kernel'),
|
('use_fedora_lt', 'kernel'),
|
||||||
('public_ssl', 'cert_data'), ('public_ssl', 'hostname'),
|
('public_ssl', 'cert_data'), ('public_ssl', 'hostname'),
|
||||||
('operator_user', 'name'),
|
('operator_user', 'name'),
|
||||||
|
|
Loading…
Reference in New Issue