Add Kitchen test + Travis CI
diff --git a/tests/pillar/compute_dpdk.sls b/tests/pillar/compute_dpdk.sls
index 0a3a498..c56fb81 100644
--- a/tests/pillar/compute_dpdk.sls
+++ b/tests/pillar/compute_dpdk.sls
@@ -14,12 +14,12 @@
local_ip: 10.1.0.105
message_queue:
engine: rabbitmq
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 5672
user: openstack
virtual_host: /openstack
metadata:
- host: 172.16.10.254
+ host: 127.0.0.1
password: password
version: mitaka
diff --git a/tests/pillar/compute_dvr.sls b/tests/pillar/compute_dvr.sls
index 9f0160e..8d5f7d5 100644
--- a/tests/pillar/compute_dvr.sls
+++ b/tests/pillar/compute_dvr.sls
@@ -13,12 +13,12 @@
local_ip: 10.1.0.105
message_queue:
engine: rabbitmq
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 5672
user: openstack
virtual_host: /openstack
metadata:
- host: 172.16.10.254
+ host: 127.0.0.1
password: password
version: mitaka
\ No newline at end of file
diff --git a/tests/pillar/compute_legacy.sls b/tests/pillar/compute_legacy.sls
index ee9d7c8..154af25 100644
--- a/tests/pillar/compute_legacy.sls
+++ b/tests/pillar/compute_legacy.sls
@@ -13,12 +13,12 @@
local_ip: 10.1.0.105
message_queue:
engine: rabbitmq
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 5672
user: openstack
virtual_host: /openstack
metadata:
- host: 172.16.10.254
+ host: 127.0.0.1
password: password
version: mitaka
diff --git a/tests/pillar/compute_nonexternal_dvr.sls b/tests/pillar/compute_nonexternal_dvr.sls
index 42fee7e..8ce0da1 100644
--- a/tests/pillar/compute_nonexternal_dvr.sls
+++ b/tests/pillar/compute_nonexternal_dvr.sls
@@ -13,12 +13,12 @@
local_ip: 10.1.0.105
message_queue:
engine: rabbitmq
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 5672
user: openstack
virtual_host: /openstack
metadata:
- host: 172.16.10.254
+ host: 127.0.0.1
password: password
version: mitaka
diff --git a/tests/pillar/compute_sriov.sls b/tests/pillar/compute_sriov.sls
index 9504878..f5a106f 100644
--- a/tests/pillar/compute_sriov.sls
+++ b/tests/pillar/compute_sriov.sls
@@ -17,12 +17,12 @@
local_ip: 10.1.0.105
message_queue:
engine: rabbitmq
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 5672
user: openstack
virtual_host: /openstack
metadata:
- host: 172.16.10.254
+ host: 127.0.0.1
password: password
version: mitaka
diff --git a/tests/pillar/control_dvr.sls b/tests/pillar/control_dvr.sls
index ca2b75e..ccac50e 100644
--- a/tests/pillar/control_dvr.sls
+++ b/tests/pillar/control_dvr.sls
@@ -11,14 +11,14 @@
address: 172.16.10.101
port: 9696
compute:
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
region: RegionOne
tenant: service
user: nova
database:
engine: mysql
- host: 172.16.10.254
+ host: 127.0.0.1
name: neutron
password: workshop
port: 3306
@@ -29,7 +29,7 @@
global_physnet_mtu: 1500
identity:
engine: keystone
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 35357
region: RegionOne
@@ -38,7 +38,7 @@
l3_ha: false
message_queue:
engine: rabbitmq
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 5672
user: openstack
diff --git a/tests/pillar/control_nodvr.sls b/tests/pillar/control_nodvr.sls
index 4fed20a..f39d7ae 100644
--- a/tests/pillar/control_nodvr.sls
+++ b/tests/pillar/control_nodvr.sls
@@ -11,14 +11,14 @@
address: 172.16.10.101
port: 9696
compute:
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
region: RegionOne
tenant: service
user: nova
database:
engine: mysql
- host: 172.16.10.254
+ host: 127.0.0.1
name: neutron
password: workshop
port: 3306
@@ -29,7 +29,7 @@
global_physnet_mtu: 1500
identity:
engine: keystone
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 35357
region: RegionOne
@@ -38,7 +38,7 @@
l3_ha: True
message_queue:
engine: rabbitmq
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 5672
user: openstack
diff --git a/tests/pillar/gateway_dvr.sls b/tests/pillar/gateway_dvr.sls
index 7591008..2c47529 100644
--- a/tests/pillar/gateway_dvr.sls
+++ b/tests/pillar/gateway_dvr.sls
@@ -13,12 +13,12 @@
local_ip: 10.1.0.110
message_queue:
engine: rabbitmq
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 5672
user: openstack
virtual_host: /openstack
metadata:
- host: 172.16.10.254
+ host: 127.0.0.1
password: password
version: mitaka
\ No newline at end of file
diff --git a/tests/pillar/gateway_legacy.sls b/tests/pillar/gateway_legacy.sls
index 661eebd..d9b7ef8 100644
--- a/tests/pillar/gateway_legacy.sls
+++ b/tests/pillar/gateway_legacy.sls
@@ -13,12 +13,12 @@
local_ip: 10.1.0.110
message_queue:
engine: rabbitmq
- host: 172.16.10.254
+ host: 127.0.0.1
password: workshop
port: 5672
user: openstack
virtual_host: /openstack
metadata:
- host: 172.16.10.254
+ host: 127.0.0.1
password: password
version: mitaka
diff --git a/tests/pillar/repo_mos9.sls b/tests/pillar/repo_mos9.sls
new file mode 100644
index 0000000..cd14fe8
--- /dev/null
+++ b/tests/pillar/repo_mos9.sls
@@ -0,0 +1,8 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack:
+ source: "deb http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/ mos9.0 main restricted"
+ architectures: amd64
+ key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 8c07e58..a4cac88 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -44,6 +44,7 @@
[ ! -d ${SALT_PILLAR_DIR} ] && mkdir -p ${SALT_PILLAR_DIR}
echo "base:" > ${SALT_PILLAR_DIR}/top.sls
for pillar in ${PILLARDIR}/*; do
+ grep ${FORMULA_NAME}: ${pillar} &>/dev/null || continue
state_name=$(basename ${pillar%.sls})
echo -e " ${state_name}:\n - ${state_name}" >> ${SALT_PILLAR_DIR}/top.sls
done
@@ -56,6 +57,7 @@
echo "base:" > ${SALT_FILE_DIR}/top.sls
for pillar in ${PILLARDIR}/*.sls; do
+ grep ${FORMULA_NAME}: ${pillar} &>/dev/null || continue
state_name=$(basename ${pillar%.sls})
echo -e " ${state_name}:\n - ${FORMULA_NAME}" >> ${SALT_FILE_DIR}/top.sls
done
@@ -126,6 +128,7 @@
run() {
for pillar in ${PILLARDIR}/*.sls; do
+ grep ${FORMULA_NAME}: ${pillar} &>/dev/null || continue
state_name=$(basename ${pillar%.sls})
salt_run --id=${state_name} state.show_sls ${FORMULA_NAME} || (log_err "Execution of ${FORMULA_NAME}.${state_name} failed"; exit 1)
done