x/kolla-mesos
Code Issues Proposed changes

Autodetect number of instances

Browse Source 
Change-Id: I8137986d9c0933b6e5046b0abaf3e6f2f1059959
Partially-Implements: blueprint multinode
This commit is contained in:
Michal Rostecki
2016-02-25 12:05:36 +01:00
parent 6189be0c6d
commit 588bfd65aa
40 changed files with 282 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/neutron/neutron-dhcp-agent.yml.j2
View File

@@ -49,7 +49,8 @@ service:
perm: "0600"
mem: {{ neutron_dhcp_agent_mem }}
cpus: {{ neutron_dhcp_agent_cpus }}
instances: {{ controller_nodes }}
constraints: [["hostname", "UNIQUE"], ["openstack_role", "CLUSTER", "controller"]]
commands:
extend_start:
command: kolla_extend_start
command: kolla_extend_start

3
services/neutron/neutron-l3-agent.yml.j2
View File

@@ -49,7 +49,8 @@ service:
perm: "0600"
mem: {{ neutron_l3_agent_mem }}
cpus: {{ neutron_l3_agent_cpus }}
instances: {{ controller_nodes }}
constraints: [["hostname", "UNIQUE"], ["openstack_role", "CLUSTER", "controller"]]
commands:
extend_start:
command: kolla_extend_start
command: kolla_extend_start

3
services/neutron/neutron-linuxbridge-agent.yml.j2
View File

@@ -35,7 +35,8 @@ service:
NEUTRON_INTERFACE: "{{ neutron_external_interface }}"
mem: {{ neutron_linuxbridge_agent_mem }}
cpus: {{ neutron_linuxbridge_agent_cpus }}
instances: {{ all_nodes }}
constraints: [["hostname", "UNIQUE"], ["openstack_role", "LIKE", "(controller|compute)"]]
commands:
extend_start:
command: kolla_extend_start
command: kolla_extend_start

3
services/neutron/neutron-metadata-agent.yml.j2
View File

@@ -42,7 +42,8 @@ service:
perm: "0600"
mem: {{ neutron_metadata_agent_mem }}
cpus: {{ neutron_metadata_agent_cpus }}
instances: {{ controller_nodes }}
constraints: [["hostname", "UNIQUE"], ["openstack_role", "CLUSTER", "controller"]]
commands:
extend_start:
command: bash kolla_extend_start
command: bash kolla_extend_start

1
services/neutron/neutron-openvswitch-agent.yml.j2
View File

@@ -32,6 +32,7 @@ service:
perm: "0600"
mem: {{ neutron_openvswitch_agent_mem }}
cpus: {{ neutron_openvswitch_agent_cpus }}
instances: {{ all_nodes }}
constraints: [["hostname", "UNIQUE"], ["openstack_role", "LIKE", "(controller|compute)"]]
commands:
extend_start:

1
services/neutron/neutron-server.yml.j2
View File

@@ -32,6 +32,7 @@ service:
perm: "0600"
mem: {{ neutron_server_mem }}
cpus: {{ neutron_server_cpus }}
instances: {{ controller_nodes }}
constraints: [["hostname", "UNIQUE"], ["openstack_role", "CLUSTER", "controller"]]
commands:
db_sync:

1
services/neutron/openvswitch-db.yml.j2
View File

@@ -17,6 +17,7 @@ service:
command: /usr/sbin/ovsdb-server /etc/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/run/openvswitch/db.sock --log-file=/var/log/openvswitch/ovsdb-server.log
mem: {{ openvswitch_db_mem }}
cpus: {{ openvswitch_db_cpus }}
instances: {{ all_nodes }}
constraints: [["hostname", "UNIQUE"], ["openstack_role", "LIKE", "(controller|compute)"]]
commands:
bootstrap:

2
services/neutron/openvswitch-vswitchd.yml.j2
View File

@@ -19,6 +19,7 @@ service:
command: /usr/sbin/ovs-vswitchd unix:/run/openvswitch/db.sock --mlockall
mem: {{ openvswitch_vswitchd_mem }}
cpus: {{ openvswitch_vswitchd_cpus }}
instances: {{ all_nodes }}
constraints: [["hostname", "UNIQUE"], ["openstack_role", "LIKE", "(controller|compute)"]]
commands:
bootstrap:
@@ -39,4 +40,3 @@ commands:
dest: /usr/local/bin/kolla_ensure_openvswitch_configured
owner: root
perm: "0755"