summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rwxr-xr-xbuild/instack.sh4
-rw-r--r--build/instackenv.json.example15
2 files changed, 12 insertions, 7 deletions
diff --git a/build/instack.sh b/build/instack.sh
index 48aef0b2..57af7f96 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -9,7 +9,7 @@ RDO_RELEASE=liberty
SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null)
# check for dependancy packages
-for i in libguestfs-tools python-docutils bsdtar; do
+for i in rpm-build createrepo libguestfs-tools python-docutils bsdtar; do
if ! rpm -q $i > /dev/null; then
sudo yum install -y $i
fi
@@ -216,7 +216,7 @@ PACKAGES+=",openstack-swift-container,openstack-swift-object,openstack-swift-plu
PACKAGES+=",openstack-nova-api,openstack-nova-cert,openstack-heat-api-cfn,openstack-heat-api,"
PACKAGES+=",openstack-ceilometer-central,openstack-ceilometer-polling,openstack-ceilometer-collector,"
PACKAGES+=",openstack-heat-api-cloudwatch,openstack-heat-engine,openstack-heat-common,openstack-ceilometer-notification"
-PACKAGES+=",hiera,puppet,memcached,keepalived,mariadb,mariadb-server,rabbitmq-server,python-pbr"
+PACKAGES+=",hiera,puppet,memcached,keepalived,mariadb,mariadb-server,rabbitmq-server,python-pbr,python-proliantutils"
LIBGUESTFS_BACKEND=direct virt-customize --install $PACKAGES -a instack.qcow2
popd
diff --git a/build/instackenv.json.example b/build/instackenv.json.example
index 949e07d5..370ff202 100644
--- a/build/instackenv.json.example
+++ b/build/instackenv.json.example
@@ -10,8 +10,9 @@
],
"pm_type": "pxe_ipmitool",
"pm_addr": "10.1.8.70",
- "pm_user": "root"
+ "pm_user": "root",
"pm_password": "password",
+ "capabilities": "profile:control"
},
{
"cpu": "24",
@@ -23,8 +24,9 @@
],
"pm_type": "pxe_ipmitool",
"pm_addr": "10.1.8.73",
- "pm_user": "root"
+ "pm_user": "root",
"pm_password": "password",
+ "capabilities": "profile:control"
},
{
"cpu": "24",
@@ -36,8 +38,9 @@
],
"pm_type": "pxe_ipmitool",
"pm_addr": "10.1.8.74",
- "pm_user": "root"
+ "pm_user": "root",
"pm_password": "password",
+ "capabilities": "profile:control"
},
{
"cpu": "24",
@@ -49,8 +52,9 @@
],
"pm_type": "pxe_ipmitool",
"pm_addr": "10.1.8.76",
- "pm_user": "root"
+ "pm_user": "root",
"pm_password": "password",
+ "capabilities": "profile:compute"
},
{
"cpu": "24",
@@ -62,8 +66,9 @@
],
"pm_type": "pxe_ipmitool",
"pm_addr": "10.1.8.78",
- "pm_user": "root"
+ "pm_user": "root",
"pm_password": "password",
+ "capabilities": "profile:compute"
}
]
}