From f85c84133c2f8d6aec3c707cfb92cb03db543bd6 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 26 May 2017 12:12:15 +0400 Subject: [mcp] Replace reclass system models with submodule Change-Id: Id693f7b0f3542d605b0f71601f3bd21eb882c7ba Signed-off-by: Michael Polenchuk --- .../classes/system/nova/control/cluster.yml | 75 ---------------------- .../system/nova/control/notification/cadf.yml | 5 -- .../nova/control/notification/messagingv2.yml | 6 -- mcp/reclass/classes/system/nova/control/single.yml | 7 -- 4 files changed, 93 deletions(-) delete mode 100644 mcp/reclass/classes/system/nova/control/cluster.yml delete mode 100644 mcp/reclass/classes/system/nova/control/notification/cadf.yml delete mode 100644 mcp/reclass/classes/system/nova/control/notification/messagingv2.yml delete mode 100644 mcp/reclass/classes/system/nova/control/single.yml (limited to 'mcp/reclass/classes/system/nova/control') diff --git a/mcp/reclass/classes/system/nova/control/cluster.yml b/mcp/reclass/classes/system/nova/control/cluster.yml deleted file mode 100644 index d47c5e197..000000000 --- a/mcp/reclass/classes/system/nova/control/cluster.yml +++ /dev/null @@ -1,75 +0,0 @@ -classes: -- service.haproxy.proxy.single -- service.nova.control.cluster -- service.keepalived.cluster.single -- system.haproxy.proxy.listen.openstack.nova -- system.haproxy.proxy.listen.openstack.novnc -parameters: - _param: - nova_vncproxy_url: http://${_param:cluster_vip_address}:6080 - nova_cpu_allocation_ratio: 16.0 - nova_ram_allocation_ratio: 1.5 - nova_disk_allocation_ratio: 1.0 - metadata_password: metadataPass - nova: - controller: - enabled: true - version: ${_param:nova_version} - vncproxy_url: ${_param:nova_vncproxy_url} - security_group: false - dhcp_domain: novalocal - scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,PciPassthroughFilter,NUMATopologyFilter,AggregateInstanceExtraSpecsFilter" - cpu_allocation_ratio: ${_param:nova_cpu_allocation_ratio} - ram_allocation_ratio: ${_param:nova_ram_allocation_ratio} - disk_allocation_ratio: ${_param:nova_disk_allocation_ratio} - workers: 8 - logging: - - engine: syslog - facility: local0 - heka: - enabled: true - bind: - private_address: ${_param:cluster_local_address} - public_address: ${_param:cluster_vip_address} - public_name: ${_param:cluster_vip_address} - novncproxy_address: ${_param:cluster_local_address} - novncproxy_port: 6080 - database: - engine: mysql - host: ${_param:openstack_database_address} - port: 3306 - name: nova - user: nova - password: ${_param:mysql_nova_password} - identity: - engine: keystone - region: ${_param:openstack_region} - host: ${_param:cluster_vip_address} - port: 35357 - user: nova - password: ${_param:keystone_nova_password} - tenant: service - message_queue: - engine: rabbitmq - port: 5672 - user: openstack - password: ${_param:rabbitmq_openstack_password} - virtual_host: '/openstack' - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} - glance: - host: ${_param:cluster_vip_address} - port: 9292 - network: - engine: neutron - region: ${_param:openstack_region} - host: ${_param:neutron_service_host} - user: neutron - password: ${_param:keystone_neutron_password} - port: 9696 - mtu: 1500 - tenant: service - metadata: - password: ${_param:metadata_password} diff --git a/mcp/reclass/classes/system/nova/control/notification/cadf.yml b/mcp/reclass/classes/system/nova/control/notification/cadf.yml deleted file mode 100644 index 2f2b1b19b..000000000 --- a/mcp/reclass/classes/system/nova/control/notification/cadf.yml +++ /dev/null @@ -1,5 +0,0 @@ -parameters: - nova: - controller: - audit: - enabled: true diff --git a/mcp/reclass/classes/system/nova/control/notification/messagingv2.yml b/mcp/reclass/classes/system/nova/control/notification/messagingv2.yml deleted file mode 100644 index 5ed801322..000000000 --- a/mcp/reclass/classes/system/nova/control/notification/messagingv2.yml +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - nova: - controller: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/nova/control/single.yml b/mcp/reclass/classes/system/nova/control/single.yml deleted file mode 100644 index 00182a370..000000000 --- a/mcp/reclass/classes/system/nova/control/single.yml +++ /dev/null @@ -1,7 +0,0 @@ -classes: -- service.nova.control.single -parameters: - nova: - controller: - database: - host: ${_param:single_address} -- cgit 1.2.3-korg