From f85c84133c2f8d6aec3c707cfb92cb03db543bd6 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 26 May 2017 12:12:15 +0400 Subject: [mcp] Replace reclass system models with submodule Change-Id: Id693f7b0f3542d605b0f71601f3bd21eb882c7ba Signed-off-by: Michael Polenchuk --- .../system/haproxy/proxy/listen/openstack/aodh.yml | 23 -------- .../haproxy/proxy/listen/openstack/ceilometer.yml | 23 -------- .../haproxy/proxy/listen/openstack/cinder.yml | 23 -------- .../haproxy/proxy/listen/openstack/designate.yml | 19 ------- .../haproxy/proxy/listen/openstack/galera.yml | 29 ---------- .../haproxy/proxy/listen/openstack/glance.yml | 42 --------------- .../haproxy/proxy/listen/openstack/glare.yml | 23 -------- .../system/haproxy/proxy/listen/openstack/heat.yml | 61 ---------------------- .../haproxy/proxy/listen/openstack/horizon.yml | 23 -------- .../haproxy/proxy/listen/openstack/keystone.yml | 42 --------------- .../haproxy/proxy/listen/openstack/murano.yml | 18 ------- .../haproxy/proxy/listen/openstack/neutron.yml | 23 -------- .../proxy/listen/openstack/nova-placement.yml | 29 ---------- .../system/haproxy/proxy/listen/openstack/nova.yml | 61 ---------------------- .../haproxy/proxy/listen/openstack/novnc.yml | 25 --------- .../haproxy/proxy/listen/openstack/sahara.yml | 24 --------- 16 files changed, 488 deletions(-) delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/aodh.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/ceilometer.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/cinder.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/designate.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/galera.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glance.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glare.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/heat.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/horizon.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/keystone.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/murano.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/neutron.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova-placement.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/novnc.yml delete mode 100644 mcp/reclass/classes/system/haproxy/proxy/listen/openstack/sahara.yml (limited to 'mcp/reclass/classes/system/haproxy/proxy/listen/openstack') diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/aodh.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/aodh.yml deleted file mode 100644 index 6b024aa2f..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/aodh.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - aodh-api: - type: openstack-service - service_name: aodh - binds: - - address: ${_param:cluster_vip_address} - port: 8042 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8042 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8042 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8042 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 \ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/ceilometer.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/ceilometer.yml deleted file mode 100644 index 68eef43c6..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/ceilometer.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - ceilometer_api: - type: general-service - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8777 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8777 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 8777 - params: check - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 8777 - params: check \ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/cinder.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/cinder.yml deleted file mode 100644 index a693e6e21..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/cinder.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - cinder_api: - type: openstack-service - service_name: cinder - binds: - - address: ${_param:cluster_vip_address} - port: 8776 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8776 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8776 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8776 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 \ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/designate.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/designate.yml deleted file mode 100644 index 7a54af27d..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/designate.yml +++ /dev/null @@ -1,19 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - designate_api: - type: openstack-service - service_name: designate - binds: - - address: ${_param:cluster_vip_address} - port: 9001 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 9001 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 9001 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/galera.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/galera.yml deleted file mode 100644 index 254dc3b03..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/galera.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - haproxy: - proxy: - timeout: - queue: '10s' - connect: '10s' - client: '10s' - server: '10s' - check: '10s' - listen: - mysql_cluster: - type: mysql - service_name: mysql - binds: - - address: ${_param:cluster_vip_address} - port: 3306 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 3306 - params: check inter 20s fastinter 2s downinter 2s rise 3 fall 3 - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 3306 - params: backup check inter 20s fastinter 2s downinter 2s rise 3 fall 3 - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 3306 - params: backup check inter 20s fastinter 2s downinter 2s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glance.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glance.yml deleted file mode 100644 index 729cc5b69..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glance.yml +++ /dev/null @@ -1,42 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - glance_api: - type: openstack-service - service_name: glance - binds: - - address: ${_param:cluster_vip_address} - port: 9292 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9292 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9292 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9292 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - glance_registry_api: - type: general-service - service_name: glance - binds: - - address: ${_param:cluster_vip_address} - port: 9191 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9191 - params: check - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9191 - params: check - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9191 - params: check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glare.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glare.yml deleted file mode 100644 index a98427511..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glare.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - glare: - type: general-service - service_name: glare - binds: - - address: ${_param:cluster_vip_address} - port: 9494 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9494 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9494 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9494 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/heat.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/heat.yml deleted file mode 100644 index 440a018b2..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/heat.yml +++ /dev/null @@ -1,61 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - heat_cloudwatch_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8000 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - heat_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8004 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8004 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8004 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8004 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - heat_cfn_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8003 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8003 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8003 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8003 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 \ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/horizon.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/horizon.yml deleted file mode 100644 index 9bf838cd7..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/horizon.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - horizon_web: - type: general-service - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8078 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8078 - params: check - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8078 - params: check - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8078 - params: check \ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/keystone.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/keystone.yml deleted file mode 100644 index 17e537ecf..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/keystone.yml +++ /dev/null @@ -1,42 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - keystone_public_api: - type: openstack-service - service_name: keystone - binds: - - address: ${_param:cluster_vip_address} - port: 5000 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 5000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 5000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 5000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - keystone_admin_api: - type: openstack-service - service_name: keystone - binds: - - address: ${_param:cluster_vip_address} - port: 35357 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 35357 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 35357 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 35357 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 \ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/murano.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/murano.yml deleted file mode 100644 index 0427820ba..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/murano.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - murano_api: - type: openstack-service - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8082 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8082 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 8082 \ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/neutron.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/neutron.yml deleted file mode 100644 index 1f8b4d596..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/neutron.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - neutron_api: - type: openstack-service - service_name: neutron - binds: - - address: ${_param:cluster_vip_address} - port: 9696 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 \ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova-placement.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova-placement.yml deleted file mode 100644 index e3b72b7dc..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova-placement.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - nova_placement_api: - mode: http - binds: - - address: ${_param:cluster_vip_address} - port: 8778 - options: - - httpclose - - httplog - health-check: - http: - options: - - expect status 401 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8778 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8778 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8778 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova.yml deleted file mode 100644 index 3865a822c..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova.yml +++ /dev/null @@ -1,61 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - nova_ec2_api: - type: general-service - service_name: nova - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8773 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8773 - params: check - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8773 - params: check - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8773 - params: check - nova_api: - type: openstack-service - service_name: nova - binds: - - address: ${_param:cluster_vip_address} - port: 8774 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8774 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8774 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8774 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - nova_metadata_api: - type: openstack-service - binds: - - address: ${_param:cluster_vip_address} - port: 8775 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8775 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8775 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8775 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/novnc.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/novnc.yml deleted file mode 100644 index 78b7d98bd..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/novnc.yml +++ /dev/null @@ -1,25 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - nova_novnc: - type: general-service - service_name: http - check: true - binds: - - address: ${_param:cluster_vip_address} - port: 6080 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 6080 - params: check - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 6080 - params: check - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 6080 - params: check - diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/sahara.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/sahara.yml deleted file mode 100644 index 3bbf8094c..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/sahara.yml +++ /dev/null @@ -1,24 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - sahara_api: - type: openstack-service - options: - - httplog - binds: - - address: ${_param:cluster_vip_address} - port: 8386 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8386 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8386 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8386 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 -- cgit 1.2.3-korg