Adds yum/apt cache attributes, corrects MQ binding
- adds an override for update_apt_cache / update_yum_cache, to stop apt.conf from showing up on RHEL and vice versa - corrects node['openstack']['bind_service']['mq']['host'] in multinode - deprecates nova-cert recipe - corrects multinode roles, adds neutron-lbaas-dashboard Depends-On: I89714e06eab803985ebffcdff5ff77655287c3e6 Depends-On: I457c239f0ff80eb78c49f7a1aae989a8368df80f Depends-On: Iea2070467503f9a434e927e2580ef2b4135e98f7 Change-Id: I7946275f1e354de210e2ec9e9ceba3436063f5a0
This commit is contained in:
parent
020c81d106
commit
db2a2ff569
|
@ -15,6 +15,9 @@
|
|||
},
|
||||
"override_attributes": {
|
||||
"openstack": {
|
||||
"apt": {
|
||||
"update_apt_cache": true
|
||||
},
|
||||
"telemetry": {
|
||||
"conf": {
|
||||
"DEFAULT": {
|
||||
|
|
|
@ -11,6 +11,9 @@
|
|||
}
|
||||
},
|
||||
"openstack": {
|
||||
"yum": {
|
||||
"update_yum_cache": true
|
||||
},
|
||||
"sysctl": {
|
||||
"net.ipv4.ip_forward": 1
|
||||
},
|
||||
|
@ -57,7 +60,7 @@
|
|||
}
|
||||
},
|
||||
"bind_service": {
|
||||
"mq": { "host": "0.0.0.0" },
|
||||
"mq": { "host": "192.168.101.60" },
|
||||
"main": {
|
||||
"identity": { "host": "0.0.0.0" }
|
||||
},
|
||||
|
|
|
@ -14,6 +14,9 @@
|
|||
},
|
||||
"override_attributes": {
|
||||
"openstack": {
|
||||
"apt": {
|
||||
"update_apt_cache": true
|
||||
},
|
||||
"sysctl": {
|
||||
"net.ipv4.ip_forward": 1
|
||||
},
|
||||
|
|
|
@ -8,8 +8,6 @@
|
|||
},
|
||||
"chef_type": "role",
|
||||
"run_list": [
|
||||
"recipe[apt]",
|
||||
"recipe[yum]",
|
||||
"recipe[build-essential]",
|
||||
"recipe[openstack-common]",
|
||||
"recipe[openstack-common::logging]",
|
||||
|
@ -43,7 +41,6 @@
|
|||
"recipe[openstack-compute::api-metadata]",
|
||||
"recipe[openstack-compute::placement_api]",
|
||||
"recipe[openstack-compute::scheduler]",
|
||||
"recipe[openstack-compute::nova-cert]",
|
||||
"recipe[openstack-compute::vncproxy]",
|
||||
"recipe[openstack-compute::compute]",
|
||||
"recipe[openstack-compute::identity_registration]",
|
||||
|
|
|
@ -8,8 +8,6 @@
|
|||
},
|
||||
"chef_type": "role",
|
||||
"run_list": [
|
||||
"recipe[apt]",
|
||||
"recipe[yum]",
|
||||
"recipe[build-essential]",
|
||||
"recipe[openstack-common]",
|
||||
"recipe[openstack-compute::compute]",
|
||||
|
|
|
@ -8,8 +8,6 @@
|
|||
},
|
||||
"chef_type": "role",
|
||||
"run_list": [
|
||||
"recipe[apt]",
|
||||
"recipe[yum]",
|
||||
"recipe[build-essential]",
|
||||
"recipe[openstack-common]",
|
||||
"recipe[openstack-common::logging]",
|
||||
|
@ -42,7 +40,6 @@
|
|||
"recipe[openstack-compute::api-os-compute]",
|
||||
"recipe[openstack-compute::api-metadata]",
|
||||
"recipe[openstack-compute::scheduler]",
|
||||
"recipe[openstack-compute::nova-cert]",
|
||||
"recipe[openstack-compute::vncproxy]",
|
||||
"recipe[openstack-compute::identity_registration]",
|
||||
"recipe[openstack-block-storage::api]",
|
||||
|
@ -57,7 +54,8 @@
|
|||
"recipe[openstack-orchestration::api-cloudwatch]",
|
||||
"recipe[openstack-orchestration::identity_registration]",
|
||||
"recipe[openstack-image::image_upload]",
|
||||
"recipe[openstack-dashboard::server]"
|
||||
"recipe[openstack-dashboard::horizon]",
|
||||
"recipe[openstack-dashboard::neutron-lbaas-dashboard]"
|
||||
],
|
||||
"env_run_lists": {
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue