From 64e82912b5351e32fa4d4ab3c08c48a6802b4dc2 Mon Sep 17 00:00:00 2001
From: QiLiang <liangqi1@huawei.com>
Date: Mon, 18 Jan 2016 08:30:38 +0000
Subject: [PATCH] Rubbos heat template update

For compatible running rubbos on openstack before liberty version

JIRA: -

Change-Id: I10848fe23538c03d9f0b7b24c9ae70cfed51ffe3
Signed-off-by: QiLiang <liangqi1@huawei.com>
(cherry picked from commit 827a986f4abc404dc803380a25d5e9ade7448f67)
---
 utils/infra_setup/heat_template/bottlenecks_rubbos_hot.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/utils/infra_setup/heat_template/bottlenecks_rubbos_hot.yaml b/utils/infra_setup/heat_template/bottlenecks_rubbos_hot.yaml
index 1b55de5a..53600443 100644
--- a/utils/infra_setup/heat_template/bottlenecks_rubbos_hot.yaml
+++ b/utils/infra_setup/heat_template/bottlenecks_rubbos_hot.yaml
@@ -81,6 +81,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_control_port }
+      admin_user: ubuntu
 
   rubbos_control_port:
     type: OS::Neutron::Port
@@ -105,6 +106,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_httpd_port }
+      admin_user: ubuntu
 
   rubbos_httpd_port:
     type: OS::Neutron::Port
@@ -123,6 +125,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_mysql1_port }
+      admin_user: ubuntu
 
   rubbos_mysql1_port:
     type: OS::Neutron::Port
@@ -141,6 +144,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_tomcat1_port }
+      admin_user: ubuntu
 
   rubbos_tomcat1_port:
     type: OS::Neutron::Port
@@ -159,6 +163,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_client1_port }
+      admin_user: ubuntu
 
   rubbos_client1_port:
     type: OS::Neutron::Port
@@ -177,6 +182,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_client2_port }
+      admin_user: ubuntu
 
   rubbos_client2_port:
     type: OS::Neutron::Port
@@ -195,6 +201,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_client3_port }
+      admin_user: ubuntu
 
   rubbos_client3_port:
     type: OS::Neutron::Port
@@ -213,6 +220,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_client4_port }
+      admin_user: ubuntu
 
   rubbos_client4_port:
     type: OS::Neutron::Port
@@ -231,6 +239,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_benchmark_port }
+      admin_user: ubuntu
 
   rubbos_benchmark_port:
     type: OS::Neutron::Port
-- 
2.16.6