From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 20 Oct 2014 10:07:19 +0000 (+0000)
Subject: Merge "Passthrough{Specific} and allNodesConfig for BlockStorage nodes"
X-Git-Tag: opnfv-6.0.0~2734
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7b48754b98ca1890aa7608d19425913a7c79f5ca;hp=34df5f9af988adda1d4ac162b35a998bbebf2c0b;p=apex-tripleo-heat-templates.git

Merge "Passthrough{Specific} and allNodesConfig for BlockStorage nodes"
---

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 2fdf97b8..ab958b77 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -207,7 +207,6 @@ resources:
         - network: ctlplane
       user_data_format: SOFTWARE_CONFIG
   NovaCompute0Deployment:
-    depends_on: [controller0AllNodesDeployment]
     type: OS::Heat::StructuredDeployment
     properties:
       signal_transport: NO_SIGNAL
@@ -254,14 +253,16 @@ resources:
         live_update_image_id: {get_param: LiveUpdateComputeImage}
         ntp_server: {get_param: NtpServer}
   NovaCompute0AllNodesDeployment:
-    depends_on: [NovaCompute0Passthrough]
+    depends_on:
+      - controller0AllNodesDeployment
+      - NovaCompute0Deployment
+      - NovaCompute0PassthroughSpecific
     type: OS::Heat::StructuredDeployment
     properties:
       signal_transport: {get_param: DefaultSignalTransport}
       config: {get_param: AllNodesConfig}
       server: {get_resource: NovaCompute0}
   NovaCompute0Passthrough:
-    depends_on: [NovaCompute0Deployment]
     type: OS::Heat::StructuredDeployment
     properties:
       config: {get_resource: NovaComputePassthrough}
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index b2042d00..55300062 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -743,6 +743,9 @@ resources:
             - name: nova_metadata
               port: 8775
               net_binds: *public_binds
+            - name: nova_novncproxy
+              port: 6080
+              net_binds: *public_binds
             - name: ceilometer
               port: 8777
               net_binds: *public_binds
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 5ddf51b5..94795934 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -294,6 +294,7 @@ resources:
         mysql:
           innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
           root-password: {get_resource: MysqlRootPassword}
+          bind_address: 127.0.0.1
         neutron:
           debug: {get_param: Debug}
           host: 127.0.0.1