Merge "controller/ceilometer: use internalURL for os endpoint type"

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 8a7ce02..9c915c4 100644 (file)
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -1,8 +1,10 @@
 heat_template_version: 2015-04-30
 
 description: >
-  Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
-  server,Dedicated RabbitMQ Server,Group of Nova Computes
+  Deploy an OpenStack environment, consisting of several node types (roles),
+  Controller, Compute, BlockStorage, SwiftStorage and CephStorage.  The Storage
+  roles enable independent scaling of the storage components, but the minimal
+  deployment is one Controller and one Compute node.
 
 
 # TODO(shadower): we should probably use the parameter groups to put
@@ -118,9 +120,9 @@ parameters:
     type: string
     default: "datacentre:br-ex"
   NeutronControlPlaneID:
-    default: ''
+    default: 'ctlplane'
     type: string
-    description: Neutron ID for ctlplane network.
+    description: Neutron ID or name for ctlplane network.
   NeutronEnableTunnelling:
     type: string
     default: "True"
@@ -314,6 +316,8 @@ parameters:
   ControllerCount:
     type: number
     default: 1
+    constraints:
+      - range: {min: 1}
   controllerExtraConfig:
     default: {}
     description: |
@@ -1103,7 +1107,7 @@ resources:
     depends_on: Networks
     properties:
       name: control_virtual_ip
-      network_id: {get_param: NeutronControlPlaneID}
+      network: {get_param: NeutronControlPlaneID}
       fixed_ips: {get_param: ControlFixedIPs}
       replacement_policy: AUTO
 

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 8a37932..7b46e85 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -95,6 +95,9 @@ pacemaker::resource_defaults::defaults:
 # horizon
 horizon::cache_backend: django.core.cache.backends.memcached.MemcachedCache
 horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
+horizon::vhost_extra_params:
+  add_listen: false
+  priority: 10
 
 # mysql
 mysql::server::manage_config_file: true

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index c330236..777af22 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -461,10 +461,8 @@ if hiera('step') >= 3 {
     $_profile_support = 'None'
   }
   $neutron_options   = {'profile_support' => $_profile_support }
-  $vhost_params = { add_listen => false }
   class { 'horizon':
     cache_server_ip    => hiera('memcache_node_ips', '127.0.0.1'),
-    vhost_extra_params => $vhost_params,
     neutron_options    => $neutron_options,
   }
 

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index b8fa89f..645ad6e 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -883,14 +883,8 @@ if hiera('step') >= 3 {
     $_profile_support = 'None'
   }
   $neutron_options   = {'profile_support' => $_profile_support }
-  $vhost_params = {
-    add_listen => false,
-    priority   => 10,
-  }
   class { 'horizon':
     cache_server_ip    => hiera('memcache_node_ips', '127.0.0.1'),
-    vhost_extra_params => $vhost_params,
-    server_aliases     => $::hostname,
     neutron_options    => $neutron_options,
   }
 

diff --git a/validation-scripts/all-nodes.sh b/validation-scripts/all-nodes.sh
index 38a5a55..fcbfcc9 100644 (file)
--- a/validation-scripts/all-nodes.sh
+++ b/validation-scripts/all-nodes.sh
@@ -15,7 +15,7 @@ function ping_controller_ips() {
 
        if [ $REMOTE_NETWORK/$LOCAL_CIDR == $LOCAL_NETWORK ]; then
          echo -n "Trying to ping $REMOTE_IP for local network $LOCAL_NETWORK..."
-         if ! ping -c 1 $REMOTE_IP &> /dev/null; then
+         if ! ping -W 300 -c 1 $REMOTE_IP &> /dev/null; then
            echo "FAILURE"
            echo "$REMOTE_IP is not pingable. Local Network: $LOCAL_NETWORK" >&2
            exit 1