Code Review / fuel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: b9e85b2)
Set public endpoints to external interface 75/37175/1
authorMichael Polenchuk <mpolenchuk@mirantis.com>
Tue, 11 Jul 2017 11:27:41 +0000 (15:27 +0400)
committerMichael Polenchuk <mpolenchuk@mirantis.com>
Tue, 11 Jul 2017 11:27:41 +0000 (15:27 +0400)
In order to pass functest/api_check, configure public endpoints of
openstack core services with external ip address.

Change-Id: I519865df5700acbcf542ea71efd87780e9f1d9d5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml [new file with mode: 0644] patch | blob
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml patch | blob | history
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml patch | blob | history
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml patch | blob | history
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml patch | blob | history
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml patch | blob | history
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml patch | blob | history
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml patch | blob | history
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml patch | blob | history
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml patch | blob | history
mcp/reclass/classes/system patch | blob | history

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml
new file mode 100644 (file)
index 0000000..e63e9d5
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml
@@ -0,0 +1,166 @@
+parameters:
+  _param:
+    haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3
+  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: ${_param:haproxy_check}
+        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: ${_param:haproxy_check}
+        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: ${_param:haproxy_check}
+        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: ${_param:haproxy_check}
+        heat_cloudwatch_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: ${_param:haproxy_check}
+        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: ${_param:haproxy_check}
+        heat_cfn_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: ${_param:haproxy_check}
+        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: ${_param:haproxy_check}
+        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: ${_param:haproxy_check}
+        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: ${_param:haproxy_check}
+        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: ${_param:haproxy_check}
+        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: ${_param:haproxy_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: ${_param:haproxy_check}
+        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: ${_param:haproxy_check}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
index 79a243d..97eda6c 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml
@@ -31,6 +31,16 @@ parameters:
         host: ${_param:openstack_control_address}
       metadata:
         host: ${_param:openstack_control_address}
+  cinder:
+    volume:
+      database:
+        host: ${_param:cluster_local_address}
+      identity:
+        host: ${_param:cluster_local_address}
+      glance:
+        host: ${_param:cluster_local_address}
+      message_queue:
+        host: ${_param:cluster_local_address}
   opendaylight:
     client:
       ovsdb_server_iface: ptcp:6639:127.0.0.1
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
index d8ab80d..17c22c5 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml
@@ -27,6 +27,8 @@ classes:
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
 - system.horizon.server.single
+- service.haproxy.proxy.single
+- cluster.virtual-mcp-ocata-common.haproxy_openstack_api
 - cluster.virtual-mcp-ocata-odl
 parameters:
   _param:
@@ -44,6 +46,12 @@ parameters:
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
+        ens6:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:cluster_public_host}
+          netmask: 255.255.255.0
   keystone:
     server:
       admin_email: ${_param:admin_email}
@@ -76,6 +84,13 @@ parameters:
         novncproxy_port: 6080
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
+  heat:
+    server:
+      bind:
+        api_cfn:
+          address: ${_param:single_address}
+        api_cloudwatch:
+          address: ${_param:single_address}
   mysql:
     server:
       version: '5.7'
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
index 87d474c..cddecd3 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml
@@ -6,7 +6,7 @@ parameters:
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_protocol: http
-    cluster_public_host: 172.16.10.101
+    cluster_public_host: 10.16.0.101
     neutron_public_protocol: http
     neutron_control_dvr: False
     neutron_tenant_network_types: "flat,vxlan"
@@ -34,25 +34,24 @@ parameters:
     rabbitmq_openstack_password: opnfv_secret
     rabbitmq_cold_password: opnfv_secret
     glance_version: ${_param:openstack_version}
-    glance_service_host: ${_param:cluster_vip_address}
+    glance_service_host: ${_param:cluster_local_address}
     keystone_version: ${_param:openstack_version}
-    keystone_service_host: ${_param:cluster_vip_address}
+    keystone_service_host: ${_param:cluster_local_address}
     heat_version: ${_param:openstack_version}
-    heat_service_host: ${_param:cluster_vip_address}
+    heat_service_host: ${_param:cluster_local_address}
     heat_domain_admin_password: opnfv_secret
     ceilometer_version: ${_param:openstack_version}
     ceilometer_service_host: 172.16.10.108
     ceilometer_database_host: ${_param:cluster_local_address}
     cinder_version: ${_param:openstack_version}
-    cinder_service_host: ${_param:cluster_vip_address}
+    cinder_service_host: ${_param:cluster_local_address}
     ceilometer_graphite_publisher_host: 172.16.10.107
     ceilometer_graphite_publisher_port: 2013
     nova_version: ${_param:openstack_version}
-    nova_service_host: ${_param:cluster_vip_address}
+    nova_service_host: ${_param:cluster_local_address}
     nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
     neutron_version: ${_param:openstack_version}
-    neutron_service_host: ${_param:cluster_vip_address}
-    glusterfs_service_host: ${_param:cluster_vip_address}
+    neutron_service_host: ${_param:cluster_local_address}
     metadata_password: password
     mysql_admin_user: root
     mysql_admin_password: opnfv_secret
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
index e4777fe..c23ca7f 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
@@ -35,6 +35,16 @@ parameters:
         host: ${_param:openstack_control_address}
       backend:
         tenant_network_types: ${_param:neutron_tenant_network_types}
+  cinder:
+    volume:
+      database:
+        host: ${_param:cluster_local_address}
+      identity:
+        host: ${_param:cluster_local_address}
+      glance:
+        host: ${_param:cluster_local_address}
+      message_queue:
+        host: ${_param:cluster_local_address}
   linux:
     network:
       bridge: openvswitch
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
index 0372906..b85f085 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
@@ -27,6 +27,8 @@ classes:
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
 - system.horizon.server.single
+- service.haproxy.proxy.single
+- cluster.virtual-mcp-ocata-common.haproxy_openstack_api
 - cluster.virtual-mcp-ocata-ovs-dpdk
 parameters:
   _param:
@@ -44,6 +46,12 @@ parameters:
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
+        ens6:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:cluster_public_host}
+          netmask: 255.255.255.0
   keystone:
     server:
       admin_email: ${_param:admin_email}
@@ -80,6 +88,13 @@ parameters:
     server:
       backend:
         tenant_vlan_range: 1000:1999
+  heat:
+    server:
+      bind:
+        api_cfn:
+          address: ${_param:single_address}
+        api_cloudwatch:
+          address: ${_param:single_address}
   mysql:
     server:
       version: '5.7'
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
index 5f40a1d..f7980f7 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
@@ -6,7 +6,7 @@ parameters:
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_protocol: http
-    cluster_public_host: 172.16.10.101
+    cluster_public_host: 10.16.0.101
     neutron_public_protocol: http
     neutron_control_dvr: False
     neutron_tenant_network_types: "flat,vlan"
@@ -21,8 +21,6 @@ parameters:
     galera_server_cluster_name: openstack_cluster
     galera_server_maintenance_password: opnfv_secret
     galera_server_admin_password: opnfv_secret
-    cluster_vip_address: 172.16.10.254
-    cluster_local_address: ${_param:single_address}
     compute_hugepages_size: 2M
     compute_hugepages_count: 1024
     compute_hugepages_mount: /mnt/hugepages_2M
@@ -44,24 +42,23 @@ parameters:
     rabbitmq_openstack_password: opnfv_secret
     rabbitmq_cold_password: opnfv_secret
     glance_version: ${_param:openstack_version}
-    glance_service_host: ${_param:cluster_vip_address}
+    glance_service_host: ${_param:cluster_local_address}
     keystone_version: ${_param:openstack_version}
-    keystone_service_host: ${_param:cluster_vip_address}
+    keystone_service_host: ${_param:cluster_local_address}
     heat_version: ${_param:openstack_version}
-    heat_service_host: ${_param:cluster_vip_address}
+    heat_service_host: ${_param:cluster_local_address}
     heat_domain_admin_password: opnfv_secret
     ceilometer_version: ${_param:openstack_version}
     ceilometer_service_host: 172.16.10.108
     cinder_version: ${_param:openstack_version}
-    cinder_service_host: ${_param:cluster_vip_address}
+    cinder_service_host: ${_param:cluster_local_address}
     ceilometer_graphite_publisher_host: 172.16.10.107
     ceilometer_graphite_publisher_port: 2013
     nova_version: ${_param:openstack_version}
-    nova_service_host: ${_param:cluster_vip_address}
+    nova_service_host: ${_param:cluster_local_address}
     nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
     neutron_version: ${_param:openstack_version}
-    neutron_service_host: ${_param:cluster_vip_address}
-    glusterfs_service_host: ${_param:cluster_vip_address}
+    neutron_service_host: ${_param:cluster_local_address}
     metadata_password: password
     mysql_admin_user: root
     mysql_admin_password: opnfv_secret
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
index cec9e35..a86a7c6 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
@@ -31,6 +31,16 @@ parameters:
         host: ${_param:openstack_control_address}
       metadata:
         host: ${_param:openstack_control_address}
+  cinder:
+    volume:
+      database:
+        host: ${_param:cluster_local_address}
+      identity:
+        host: ${_param:cluster_local_address}
+      glance:
+        host: ${_param:cluster_local_address}
+      message_queue:
+        host: ${_param:cluster_local_address}
   linux:
     network:
       bridge: openvswitch
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
index b3f0ca7..ae103cd 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
@@ -27,11 +27,11 @@ classes:
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
 - system.horizon.server.single
+- service.haproxy.proxy.single
+- cluster.virtual-mcp-ocata-common.haproxy_openstack_api
 - cluster.virtual-mcp-ocata-ovs
 parameters:
   _param:
-    keepalived_vip_interface: ens4
-    keepalived_openstack_telemetry_vip_interface: ens4
     linux_system_codename: xenial
   linux:
     system:
@@ -46,6 +46,12 @@ parameters:
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
+        ens6:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:cluster_public_host}
+          netmask: 255.255.255.0
   keystone:
     server:
       admin_email: ${_param:admin_email}
@@ -78,6 +84,13 @@ parameters:
         novncproxy_port: 6080
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
+  heat:
+    server:
+      bind:
+        api_cfn:
+          address: ${_param:single_address}
+        api_cloudwatch:
+          address: ${_param:single_address}
   mysql:
     server:
       version: '5.7'
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index 77b6a5d..866724d 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -6,7 +6,7 @@ parameters:
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_protocol: http
-    cluster_public_host: 172.16.10.101
+    cluster_public_host: 10.16.0.101
     neutron_public_protocol: http
     neutron_control_dvr: False
     neutron_tenant_network_types: "flat,vxlan"
@@ -34,25 +34,24 @@ parameters:
     rabbitmq_openstack_password: opnfv_secret
     rabbitmq_cold_password: opnfv_secret
     glance_version: ${_param:openstack_version}
-    glance_service_host: ${_param:cluster_vip_address}
+    glance_service_host: ${_param:cluster_local_address}
     keystone_version: ${_param:openstack_version}
-    keystone_service_host: ${_param:cluster_vip_address}
+    keystone_service_host: ${_param:cluster_local_address}
     heat_version: ${_param:openstack_version}
-    heat_service_host: ${_param:cluster_vip_address}
+    heat_service_host: ${_param:cluster_local_address}
     heat_domain_admin_password: opnfv_secret
     ceilometer_version: ${_param:openstack_version}
     ceilometer_service_host: 172.16.10.108
     ceilometer_database_host: ${_param:cluster_local_address}
     cinder_version: ${_param:openstack_version}
-    cinder_service_host: ${_param:cluster_vip_address}
+    cinder_service_host: ${_param:cluster_local_address}
     ceilometer_graphite_publisher_host: 172.16.10.107
     ceilometer_graphite_publisher_port: 2013
     nova_version: ${_param:openstack_version}
-    nova_service_host: ${_param:cluster_vip_address}
+    nova_service_host: ${_param:cluster_local_address}
     nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
     neutron_version: ${_param:openstack_version}
-    neutron_service_host: ${_param:cluster_vip_address}
-    glusterfs_service_host: ${_param:cluster_vip_address}
+    neutron_service_host: ${_param:cluster_local_address}
     metadata_password: password
     mysql_admin_user: root
     mysql_admin_password: opnfv_secret
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
index 947500a..d2e5ecd 160000 (submodule)
--- a/mcp/reclass/classes/system
+++ b/mcp/reclass/classes/system
@@ -1 +1 @@
-Subproject commit 947500aa320e5d6ba26fa5fe18f4bd260015fd9d
+Subproject commit d2e5ecd5ca54243b18b40f7e2805374e338b7dec