Merge "Add iscsid/tgtd specific parameters to Kolla infrastructure"
This commit is contained in:
commit
0078d9b4a1
@ -86,6 +86,8 @@ tunnel_interface: "{{ network_interface }}"
|
|||||||
neutron_plugin_agent: "openvswitch"
|
neutron_plugin_agent: "openvswitch"
|
||||||
|
|
||||||
# The default ports used by each service.
|
# The default ports used by each service.
|
||||||
|
iscsi_port: "3260"
|
||||||
|
|
||||||
mariadb_port: "3306"
|
mariadb_port: "3306"
|
||||||
mariadb_wsrep_port: "4567"
|
mariadb_wsrep_port: "4567"
|
||||||
mariadb_ist_port: "4568"
|
mariadb_ist_port: "4568"
|
||||||
@ -188,6 +190,7 @@ enable_cinder: "no"
|
|||||||
enable_heat: "yes"
|
enable_heat: "yes"
|
||||||
enable_horizon: "yes"
|
enable_horizon: "yes"
|
||||||
enable_ironic: "no"
|
enable_ironic: "no"
|
||||||
|
enable_iscsi: "no"
|
||||||
enable_magnum: "no"
|
enable_magnum: "no"
|
||||||
enable_manila: "no"
|
enable_manila: "no"
|
||||||
enable_mistral: "no"
|
enable_mistral: "no"
|
||||||
|
@ -146,6 +146,13 @@ cinder
|
|||||||
[cinder-volume:children]
|
[cinder-volume:children]
|
||||||
storage
|
storage
|
||||||
|
|
||||||
|
# iSCSI
|
||||||
|
[iscsd:children]
|
||||||
|
storage
|
||||||
|
|
||||||
|
[tgtd:children]
|
||||||
|
storage
|
||||||
|
|
||||||
# Manila
|
# Manila
|
||||||
[manila-api:children]
|
[manila-api:children]
|
||||||
manila
|
manila
|
||||||
|
@ -119,14 +119,6 @@
|
|||||||
state: stopped
|
state: stopped
|
||||||
when: inventory_hostname in groups['haproxy']
|
when: inventory_hostname in groups['haproxy']
|
||||||
|
|
||||||
- name: Checking free port for iSCSI Target
|
|
||||||
wait_for:
|
|
||||||
host: "{{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}"
|
|
||||||
port: "3260"
|
|
||||||
connect_timeout: 1
|
|
||||||
state: stopped
|
|
||||||
when: inventory_hostname in groups['cinder-volume']
|
|
||||||
|
|
||||||
- name: Checking free port for Keystone Admin
|
- name: Checking free port for Keystone Admin
|
||||||
wait_for:
|
wait_for:
|
||||||
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
|
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
|
||||||
@ -159,6 +151,14 @@
|
|||||||
state: stopped
|
state: stopped
|
||||||
when: inventory_hostname in groups['haproxy']
|
when: inventory_hostname in groups['haproxy']
|
||||||
|
|
||||||
|
- name: Checking free port for iscsi
|
||||||
|
wait_for:
|
||||||
|
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
|
||||||
|
port: "{{ iscsi_port }}"
|
||||||
|
connect_timeout: 1
|
||||||
|
state: stopped
|
||||||
|
when: inventory_hostname in groups['tgtd']
|
||||||
|
|
||||||
- name: Checking free port for MariaDB
|
- name: Checking free port for MariaDB
|
||||||
wait_for:
|
wait_for:
|
||||||
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
|
host: "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"
|
||||||
|
@ -20,6 +20,8 @@
|
|||||||
- haproxy
|
- haproxy
|
||||||
- keystone
|
- keystone
|
||||||
- mariadb
|
- mariadb
|
||||||
|
- iscsid
|
||||||
|
- tgtd
|
||||||
- murano-api
|
- murano-api
|
||||||
- neutron-server
|
- neutron-server
|
||||||
- nova-api
|
- nova-api
|
||||||
@ -50,6 +52,14 @@
|
|||||||
tags: mariadb,
|
tags: mariadb,
|
||||||
when: enable_mariadb | bool }
|
when: enable_mariadb | bool }
|
||||||
|
|
||||||
|
- hosts:
|
||||||
|
- iscsid
|
||||||
|
- tgtd
|
||||||
|
roles:
|
||||||
|
- { role: iscsi,
|
||||||
|
tags: iscsi,
|
||||||
|
when: enable_iscsi | bool }
|
||||||
|
|
||||||
- hosts: rabbitmq
|
- hosts: rabbitmq
|
||||||
roles:
|
roles:
|
||||||
- { role: rabbitmq,
|
- { role: rabbitmq,
|
||||||
|
@ -32,7 +32,7 @@ _PROFILE_OPTS = [
|
|||||||
help='Infra images'),
|
help='Infra images'),
|
||||||
cfg.ListOpt('main',
|
cfg.ListOpt('main',
|
||||||
default=['cinder', 'ceilometer', 'glance', 'heat',
|
default=['cinder', 'ceilometer', 'glance', 'heat',
|
||||||
'horizon', 'keystone', 'neutron', 'nova',
|
'horizon', 'iscsi', 'keystone', 'neutron', 'nova',
|
||||||
'swift'],
|
'swift'],
|
||||||
help='Main images'),
|
help='Main images'),
|
||||||
cfg.ListOpt('aux',
|
cfg.ListOpt('aux',
|
||||||
|
Loading…
Reference in New Issue
Block a user