diff options
| -rw-r--r-- | ansible/inventory/multinode | 13 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/deploy.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/pull.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/start.yml | 6 | ||||
| -rw-r--r-- | ansible/site.yml | 1 |
5 files changed, 26 insertions, 0 deletions
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index 3491b1ec9..f1a154062 100644 --- a/ansible/inventory/multinode +++ b/ansible/inventory/multinode @@ -93,6 +93,9 @@ control [mistral:children] control +[manila:children] +control + # Additional control implemented here. These groups allow you to control which # services run on which hosts at a per-service level. # @@ -155,6 +158,16 @@ cinder [cinder-volume:children] storage +# Manila +[manila-api:children] +manila + +[manila-scheduler:children] +manila + +[manila-share:children] +storage + # Swift [swift-proxy-server:children] swift diff --git a/ansible/roles/neutron/tasks/deploy.yml b/ansible/roles/neutron/tasks/deploy.yml index 6b5609c75..524f0418c 100644 --- a/ansible/roles/neutron/tasks/deploy.yml +++ b/ansible/roles/neutron/tasks/deploy.yml @@ -7,6 +7,7 @@ - include: config.yml when: inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent'] @@ -22,6 +23,7 @@ - include: start.yml when: inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent'] diff --git a/ansible/roles/neutron/tasks/pull.yml b/ansible/roles/neutron/tasks/pull.yml index 057ced152..863115bbb 100644 --- a/ansible/roles/neutron/tasks/pull.yml +++ b/ansible/roles/neutron/tasks/pull.yml @@ -20,6 +20,7 @@ image: "{{ neutron_linuxbridge_agent_image_full }}" when: - (inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -39,6 +40,7 @@ image: "{{ neutron_openvswitch_agent_image_full }}" when: - (inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -58,6 +60,7 @@ image: "{{ openvswitch_db_image_full }}" when: - (inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -70,6 +73,7 @@ image: "{{ openvswitch_vswitchd_image_full }}" when: - (inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml index 48f65f01f..1a59ac09f 100644 --- a/ansible/roles/neutron/tasks/start.yml +++ b/ansible/roles/neutron/tasks/start.yml @@ -11,6 +11,7 @@ - "openvswitch_db:/var/lib/openvswitch/" when: - (inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -25,6 +26,7 @@ delay: 2 when: - (inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -36,6 +38,7 @@ changed_when: status.stdout.find('changed') != -1 when: - (inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -54,6 +57,7 @@ - "/run:/run" when: - (inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -85,6 +89,7 @@ when: - ( ( inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent'] @@ -134,6 +139,7 @@ - "kolla_logs:/var/log/kolla/" when: - (inventory_hostname in groups['compute'] + inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) diff --git a/ansible/site.yml b/ansible/site.yml index bebc8b666..840e607e1 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -100,6 +100,7 @@ - hosts: - compute + - manila-share - neutron-dhcp-agent - neutron-l3-agent - neutron-metadata-agent |