Merge "Make Mesos resources configurable"

config/cinder/defaults/main.yml

@@ -64,3 +64,23 @@ cinder_logging_debug: "{{ openstack_logging_debug }}"
 cinder_keystone_user: "cinder"
 
 openstack_cinder_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}"
+
+
+####################
+# Resources
+####################
+# cinder-api
+cinder_api_mem: "128"
+cinder_api_cpus: "0.3"
+# cinder-backup
+cinder_backup_mem: "128"
+cinder_backup_cpus: "0.3"
+# cinder-init
+cinder_init_mem: "512"
+cinder_init_cpus: "0.3"
+# cinder-scheduler
+cinder_scheduler_mem: "128"
+cinder_scheduler_cpus: "0.3"
+# cinder-volume
+cinder_volume_mem: "128"
+cinder_volume_cpus: "0.3"

config/glance/defaults/main.yml

@@ -46,3 +46,17 @@ glance_logging_debug: "{{ openstack_logging_debug }}"
 glance_keystone_user: "glance"
 
 openstack_glance_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}"
+
+
+####################
+# Resources
+####################
+# glance-api
+glance_api_mem: "128"
+glance_api_cpus: "0.3"
+# glance-init
+glance_init_mem: "512"
+glance_init_cpus: "0.3"
+# glance-registry
+glance_registry_mem: "128"
+glance_registry_cpus: "0.3"

config/horizon/defaults/main.yml

@@ -6,3 +6,10 @@ project_name: "horizon"
 ####################
 horizon_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-horizon"
 horizon_tag: "{{ openstack_release }}"
+
+
+####################
+# Resources
+####################
+horizon_mem: "128"
+horizon_cpus: "0.3"

config/keystone/defaults/main.yml

@@ -29,3 +29,14 @@ keystone_logging_debug: "{{ openstack_logging_debug }}"
 
 openstack_keystone_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}"
 openstack_keystone_token_auth: "{'endpoint':'{{ openstack_auth_v2.auth_url }}','token':'{{ keystone_admin_token }}'}"
+
+
+####################
+# Resources
+####################
+# keystone-api
+keystone_api_mem: "128"
+keystone_api_cpus: "0.3"
+# keystone-init
+keystone_init_mem: "512"
+keystone_init_cpus: "0.3"

config/mariadb/defaults/main.yml

@@ -17,3 +17,10 @@ mariadb_tag: "{{ openstack_release }}"
 #mariadb_data_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-data"
 #mariadb_data_tag: "{{ openstack_release }}"
 #mariadb_data_image_full: "{{ mariadb_data_image }}:{{ mariadb_data_tag }}"
+
+
+####################
+# Resources
+####################
+mariadb_mem: "128"
+mariadb_cpus: "0.3"

config/memcached/defaults/main.yml

@@ -7,3 +7,10 @@ project_name: "memcached"
 memcached_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-memcached"
 memcached_tag: "{{ openstack_release }}"
 memcached_image_full: "{{ memcached_image }}:{{ memcached_tag }}"
+
+
+####################
+# Resources
+####################
+memcached_mem: "128"
+memcached_cpus: "0.3"

config/nova/defaults/main.yml

@@ -78,3 +78,35 @@ nova_logging_debug: "{{ openstack_logging_debug }}"
 nova_keystone_user: "nova"
 
 openstack_nova_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}"
+
+
+####################
+# Resources
+####################
+# nova-api
+nova_api_mem: "128"
+nova_api_cpus: "0.3"
+# nova-compute
+nova_compute_mem: "1024"
+nova_compute_cpus: "2"
+# nova-conductor
+nova_conductor_mem: "128"
+nova_conductor_cpus: "0.3"
+# nova-consoleauth
+nova_consoleauth_mem: "128"
+nova_consoleauth_cpus: "0.3"
+# nova-init
+nova_init_mem: "512"
+nova_init_cpus: "0.3"
+# nova-libvirt
+nova_libvirt_mem: "1024"
+nova_libvirt_cpus: "2"
+# nova-novncproxy
+nova_novncproxy_mem: "128"
+nova_novncproxy_cpus: "0.3"
+# nova-scheduler
+nova_scheduler_mem: "128"
+nova_scheduler_cpus: "0.3"
+# noca-spicehtml3proxy
+nova_spicehtml3proxy_mem: "128"
+nova_spicehtml3proxy_cpus: "0.3"

config/rabbitmq/defaults/main.yml

@@ -18,3 +18,10 @@ rabbitmq_data_image_full: "{{ rabbitmq_data_image }}:{{ rabbitmq_data_tag }}"
 ####################
 rabbitmq_user: "openstack"
 rabbitmq_cluster_name: "openstack"
+
+
+####################
+# Resources
+####################
+rabbitmq_mem: "128"
+rabbitmq_cpus: "0.3"

services/cinder/cinder-api.yml.j2

@@ -9,6 +9,8 @@ service:
                    rabbitmq/daemon,
                    cinder-api/db_sync]
     command: /usr/bin/cinder-api
+  mem: {{ cinder_api_mem }}
+  cpus: {{ cinder_api_cpus }}
 
 commands:
   db_sync:

services/cinder/cinder-backup.yml.j2

@@ -22,4 +22,6 @@ service:
                  "/etc/kolla-mesos/config/cinder/cinder-backup.conf"]
         dest: /etc/cinder/cinder.conf
         owner: cinder
-        perm: "0600"
+        perm: "0600"
+  mem: {{ cinder_backup_mem }}
+  cpus: {{ cinder_backup_cpus }}

services/cinder/cinder-init.yml.j2

@@ -3,6 +3,8 @@ enabled: {{ enable_cinder | bool }}
 container:
   image: "{{ kolla_toolbox_image }}:{{ kolla_toolbox_tag }}"
 task:
+  mem: {{ toolbox_mem }}
+  cpus: {{ toolbox_cpus }}
 commands:
   create_database:
     run_once: True

services/cinder/cinder-scheduler.yml.j2

@@ -20,3 +20,5 @@ service:
         dest: /etc/cinder/cinder.conf
         owner: cinder
         perm: "0600"
+  mem: {{ cinder_scheduler_mem }}
+  cpus: {{ cinder_scheduler_cpus }}

services/cinder/cinder-volume.yml.j2

@@ -20,3 +20,5 @@ service:
         dest: /etc/cinder/cinder.conf
         owner: cinder
         perm: "0600"
+  mem: {{ cinder_volume_mem }}
+  cpus: {{ cinder_volume_cpus }}

services/default.marathon.j2

@@ -1,8 +1,6 @@
 {
     "id": "/{{ deployment_id }}/{{ service_name }}",
     "instances": 1,
-    "mem": 512,
-    "cpus": 0.3,
     "container": {
         "type": "DOCKER",
         "docker": {

services/glance/glance-api.yml.j2

@@ -8,6 +8,8 @@ service:
                    glance_ansible_tasks/database_user_create,
                    glance-api/db_sync]
     command: glance-api
+  mem: {{ glance_api_mem }}
+  cpus: {{ glance_api_cpus }}
 
 commands:
   db_sync:

services/glance/glance-init.yml.j2

@@ -3,6 +3,8 @@ enabled: {{ enable_glance | bool }}
 container:
   image: "{{ kolla_toolbox_image }}:{{ kolla_toolbox_tag }}"
 task:
+  mem: {{ glance_init_mem }}
+  cpus: {{ glance_init_cpus }}
 commands:
   create_database:
     run_once: True

services/glance/glance-registry.yml.j2

@@ -17,3 +17,5 @@ service:
         dest: /etc/glance/glance-registry.conf
         owner: glance
         perm: "0600"
+  mem: {{ glance_registry_mem }}
+  cpus: {{ glance_registry_cpus }}

services/horizon/horizon.yml.j2

@@ -20,6 +20,8 @@ service:
         dest: /etc/openstack-dashboard/local_settings
         owner: horizon
         perm: "0644"
+  mem: {{ horizon_mem }}
+  cpus: {{ horizon_cpus }}
 
 commands:
   bootstrap:

services/keystone/keystone-api.yml.j2

@@ -16,6 +16,8 @@ service:
         dest: /etc/{{ keystone_dir }}/keystone.conf
         owner: keystone
         perm: "0600"
+  mem: {{ keystone_api_mem }}
+  cpus: {{ keystone_api_cpus }}
 
 commands:
   db_sync:

services/keystone/keystone-init.yml.j2

@@ -3,6 +3,8 @@ enabled: {{ enable_keystone | bool }}
 container:
   image: "{{ kolla_toolbox_image }}:{{ kolla_toolbox_tag }}"
 task:
+  mem: {{ keystone_init_mem }}
+  cpus: {{ keystone_init_cpus }}
 commands:
   create_database:
     run_once: True

services/mariadb/mariadb.yml.j2

@@ -10,6 +10,8 @@ service:
   daemon:
     command: /usr/bin/mysqld_safe --wsrep-new-cluster
     dependencies: [mariadb/bootstrap]
+  mem: {{ mariadb_mem }}
+  cpus: {{ mariadb_cpus }}
 
 commands:
   bootstrap:

services/memcached/memcached.yml.j2

@@ -6,4 +6,6 @@ service:
   daemon:
     {% raw %}
     command: /usr/bin/memcached -vv -l {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} -p {{ memcached_port }}
-    {% endraw %}
+    {% endraw %}
+  mem: {{ memcached_mem }}
+  cpus: {{ memcached_cpus }}

services/nova/nova-api.yml.j2

@@ -22,3 +22,5 @@ service:
         dest: /etc/nova/nova.conf
         owner: nova
         perm: "0600"
+  mem: {{ nova_api_mem }}
+  cpus: {{ nova_api_cpus }}

services/nova/nova-compute.yml.j2

@@ -4,9 +4,9 @@ container:
   image: "{{ nova_compute_image }}:{{ nova_compute_tag }}"
   privileged: true
 service:
-  mem: 1024
+  mem: {{ nova_compute_mem }}
   taskRateLimit: 600.0
-  cpus: 2
+  cpus: {{ nova_compute_cpus }}
   volumes:
     - containerPath: "/lib/modules"
       hostPath: "/lib/modules"

services/nova/nova-conductor.yml.j2

@@ -6,6 +6,8 @@ service:
   daemon:
     dependencies: [nova-conductor/db_sync, nova_ansible_tasks/create_user]
     command: nova-conductor --config-file /etc/nova/nova.conf --config-file /etc/nova/nova-override.conf
+  mem: {{ nova_conductor_mem }}
+  cpus: {{ nova_conductor_cpus }}
 
 commands:
   db_sync:

services/nova/nova-consoleauth.yml.j2

@@ -21,3 +21,5 @@ service:
         dest: /etc/nova/nova.conf
         owner: nova
         perm: "0600"
+  mem: {{ nova_consoleauth_mem }}
+  cpus: {{ nova_consoleauth_cpus }}

services/nova/nova-init.yml.j2

@@ -3,6 +3,8 @@ enabled: {{ enable_nova | bool }}
 container:
   image: "{{ kolla_toolbox_image }}:{{ kolla_toolbox_tag }}"
 task:
+  mem: {{ nova_init_mem }}
+  cpus: {{ nova_init_cpus }}
 commands:
   create_database:
     run_once: True

services/nova/nova-libvirt.yml.j2

@@ -4,9 +4,9 @@ container:
   image: "{{ nova_libvirt_image }}:{{ nova_libvirt_tag }}"
   privileged: true
 service:
-  mem: 1024
+  mem: {{ nova_libvirt_mem }}
   taskRateLimit: 600.0
-  cpus: 2
+  cpus: {{ nova_libvirt_cpus }}
   volumes:
     - containerPath: "/lib/modules"
       hostPath: "/lib/modules"

services/nova/nova-novncproxy.yml.j2

@@ -21,3 +21,5 @@ service:
         dest: /etc/nova/nova.conf
         owner: nova
         perm: "0600"
+  mem: {{ nova_novncproxy_mem }}
+  cpus: {{ nova_novncproxy_cpus }}

services/nova/nova-scheduler.yml.j2

@@ -21,3 +21,5 @@ service:
         dest: /etc/nova/nova.conf
         owner: nova
         perm: "0600"
+  mem: {{ nova_scheduler_mem }}
+  cpus: {{ nova_scheduler_cpus }}

services/nova/nova-spicehtml3proxy.yml.j2

@@ -21,3 +21,5 @@ service:
         dest: /etc/nova/nova.conf
         owner: nova
         perm: "0600"
+  mem: {{ nova_spicehtml3proxy_mem }}
+  cpus: {{ nova_spicehtml3proxy_cpus }}

services/rabbitmq/rabbitmq.yml.j2

@@ -22,6 +22,8 @@ service:
         dest: /etc/rabbitmq/rabbitmq_clusterer.config
         owner: rabbitmq
         perm: "0600"
+  mem: {{ rabbitmq_mem }}
+  cpus: {{ rabbitmq_cpus }}
 
 commands:
   bootstrap: