Merge "Add support for config generation"
diff --git a/README.rst b/README.rst
index d415871..76d1f6c 100644
--- a/README.rst
+++ b/README.rst
@@ -27,6 +27,7 @@
ram_allocation_ratio: 1.0
disk_allocation_ratio: 1.0
workers: 8
+ report_interval: 60
bind:
public_address: 10.0.0.122
public_name: openstack.domain.com
@@ -56,6 +57,7 @@
engine: neutron
host: 127.0.0.1
port: 9696
+ extension_sync_interval: 600
identity:
engine: keystone
host: 127.0.0.1
diff --git a/other-requirements.txt b/bindep.txt
similarity index 100%
rename from other-requirements.txt
rename to bindep.txt
diff --git a/nova/files/kilo/nova-compute.conf.Debian b/nova/files/kilo/nova-compute.conf.Debian
index 4f19730..fcf3ae3 100644
--- a/nova/files/kilo/nova-compute.conf.Debian
+++ b/nova/files/kilo/nova-compute.conf.Debian
@@ -23,9 +23,7 @@
use_cow_images = {{ compute.image.use_cow }}
{%- endif %}
-{%- if compute.reserved_host_memory_mb is defined %}
-reserved_host_memory_mb = {{ compute.reserved_host_memory_mb }}
-{%- endif %}
+reserved_host_memory_mb = {{ compute.get('reserved_host_memory_mb', '512') }}
allow_resize_to_same_host=True
@@ -69,7 +67,6 @@
{%- endif %}
security_group_api = neutron
-heal_instance_info_cache_interval = 0
libvirt_cpu_mode = host-passthrough
image_cache_manager_interval = 0
firewall_driver = nova.virt.firewall.NoopFirewallDriver
@@ -83,7 +80,7 @@
rpc_conn_pool_size = 300
rpc_response_timeout = 3600
rpc_thread_pool_size = 70
-report_interval = 5
+report_interval = {{ compute.get('report_interval', '60') }}
block_device_allocate_retries=600
block_device_allocate_retries_interval=10
@@ -172,7 +169,9 @@
admin_tenant_name={{ compute.identity.tenant }}
admin_auth_url=http://{{ compute.identity.host }}:{{ compute.identity.port }}/v{% if compute.identity.get('version', 2) == 2 %}2.0{% else %}3{% endif %}
url=http://{{ compute.network.host }}:{{ compute.network.port }}
+extension_sync_interval={{ compute.network.get('extension_sync_interval', '600') }}
region_name= {{ compute.network.region }}
+timeout=30
[cinder]
os_region_name = {{ compute.identity.region }}
diff --git a/nova/files/liberty/nova-compute.conf.Debian b/nova/files/liberty/nova-compute.conf.Debian
index 5f36af6..9ed941e 100644
--- a/nova/files/liberty/nova-compute.conf.Debian
+++ b/nova/files/liberty/nova-compute.conf.Debian
@@ -21,9 +21,7 @@
use_cow_images = {{ compute.image.use_cow }}
{%- endif %}
-{%- if compute.reserved_host_memory_mb is defined %}
-reserved_host_memory_mb = {{ compute.reserved_host_memory_mb }}
-{%- endif %}
+reserved_host_memory_mb = {{ compute.get('reserved_host_memory_mb', '512') }}
allow_resize_to_same_host=True
@@ -67,7 +65,6 @@
{%- endif %}
security_group_api = neutron
-heal_instance_info_cache_interval = 0
libvirt_cpu_mode = host-passthrough
image_cache_manager_interval = 0
firewall_driver = nova.virt.firewall.NoopFirewallDriver
@@ -81,7 +78,7 @@
rpc_conn_pool_size = 300
rpc_response_timeout = 3600
rpc_thread_pool_size = 70
-report_interval = 5
+report_interval = {{ compute.get('report_interval', '60') }}
block_device_allocate_retries=600
block_device_allocate_retries_interval=10
@@ -166,11 +163,13 @@
[neutron]
auth_strategy = keystone
admin_username={{ compute.network.user }}
+extension_sync_interval={{ compute.network.get('extension_sync_interval', '600') }}
admin_password={{ compute.network.password }}
admin_tenant_name={{ compute.identity.tenant }}
admin_auth_url=http://{{ compute.identity.host }}:{{ compute.identity.port }}/v{% if compute.identity.get('version', 2) == 2 %}2.0{% else %}3{% endif %}
url=http://{{ compute.network.host }}:{{ compute.network.port }}
region_name= {{ compute.network.region }}
+timeout=30
[cinder]
os_region_name = {{ compute.identity.region }}
diff --git a/nova/files/mitaka/nova-compute.conf.Debian b/nova/files/mitaka/nova-compute.conf.Debian
index a4cd639..6168d6e 100644
--- a/nova/files/mitaka/nova-compute.conf.Debian
+++ b/nova/files/mitaka/nova-compute.conf.Debian
@@ -20,9 +20,7 @@
use_cow_images = {{ compute.image.use_cow }}
{%- endif %}
-{%- if compute.reserved_host_memory_mb is defined %}
-reserved_host_memory_mb = {{ compute.reserved_host_memory_mb }}
-{%- endif %}
+reserved_host_memory_mb = {{ compute.get('reserved_host_memory_mb', '512') }}
allow_resize_to_same_host=True
@@ -41,7 +39,6 @@
heal_instance_info_cache_interval = {{ compute.heal_instance_info_cache_interval }}
-heal_instance_info_cache_interval = 0
image_cache_manager_interval = 0
firewall_driver = nova.virt.firewall.NoopFirewallDriver
glance_port = 9292
@@ -51,7 +48,7 @@
rpc_cast_timeout = 30
rpc_response_timeout = 3600
executor_thread_pool_size = 70
-report_interval = 5
+report_interval = {{ compute.get('report_interval', '60') }}
block_device_allocate_retries=600
block_device_allocate_retries_interval=10
@@ -143,9 +140,11 @@
auth_url=http://{{ compute.identity.host }}:{{ compute.identity.port }}
url=http://{{ compute.network.host }}:{{ compute.network.port }}
region_name= {{ compute.network.region }}
+extension_sync_interval={{ compute.network.get('extension_sync_interval', '600') }}
auth_type = password
project_domain_name = default
user_domain_name = default
+timeout=30
[cinder]
os_region_name = {{ compute.identity.region }}
diff --git a/nova/map.jinja b/nova/map.jinja
index 27a30a2..43789ad 100644
--- a/nova/map.jinja
+++ b/nova/map.jinja
@@ -7,7 +7,7 @@
{% set controller = salt['grains.filter_by']({
'Debian': {
- 'pkgs': ['nova-novncproxy', 'novnc', 'nova-api', 'nova-ajax-console-proxy', 'nova-cert', 'nova-conductor', 'nova-consoleauth', 'nova-doc', 'nova-scheduler', 'python-novaclient', 'python-memcache', 'gettext-base'],
+ 'pkgs': ['nova-novncproxy', 'novnc', 'nova-api', 'nova-cert', 'nova-conductor', 'nova-consoleauth', 'nova-doc', 'nova-scheduler', 'python-novaclient', 'python-memcache', 'gettext-base'],
'services': ['nova-api', 'nova-cert', 'nova-consoleauth', 'nova-scheduler', 'nova-conductor', 'nova-novncproxy'],
'debug': false,
},
diff --git a/nova/meta/sensu.yml b/nova/meta/sensu.yml
index d5e1df0..a0c2387 100644
--- a/nova/meta/sensu.yml
+++ b/nova/meta/sensu.yml
@@ -1,6 +1,6 @@
check:
local_nova_api_proc:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nova-api -u nova -c 1:30"
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nova-api -u nova -c 1:1024"
interval: 60
occurrences: 1
subscribers:
@@ -24,7 +24,7 @@
subscribers:
- local-nova-controller
local_nova_conductor_proc:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nova-conductor -u nova -c 1:10"
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nova-conductor -u nova -c 1:1024"
interval: 60
occurrences: 1
subscribers:
@@ -35,14 +35,8 @@
occurrences: 1
subscribers:
- local-nova-controller
- #local_nova_api_rabbitmq_logs:
- # command: "PATH=$PATH:/etc/sensu/plugins check_log.sh -p /var/log/nova/nova-api.log -l 10 -r 'Queue not found' -c 5"
- # interval: 60
- # occurrences: 1
- # subscribers:
- # - local-nova-controller
local_nova_compute_proc:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nova-compute -u nova -c 1:10"
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nova-compute -u nova -c 1:1"
interval: 60
occurrences: 1
asset: asset01
diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls
index d4085e1..e1d3541 100644
--- a/tests/pillar/compute_cluster.sls
+++ b/tests/pillar/compute_cluster.sls
@@ -5,6 +5,7 @@
virtualization: kvm
heal_instance_info_cache_interval: 60
vncproxy_url: openstack:6080
+ report_interval: 60
vnc_keymap: en-gb
bind:
vnc_address: 127.0.0.1
@@ -43,6 +44,7 @@
region: RegionOne
host: 127.0.0.1
port: 9696
+ extension_sync_interval: 600
cache:
engine: memcached
members: