Merge "Fix dashboard integration testing"

This commit is contained in:
Jenkins 2016-03-10 20:41:22 +00:00 committed by Gerrit Code Review
commit 22f99b219b
3 changed files with 10 additions and 16 deletions

View File

@ -1,12 +1,6 @@
{ {
"id": "horizon.key", "id": "horizon.key",
"file-name": { "horizon.key": {
"encrypted_data": "FxrbYKKoZ67twK/ZzA8YWjjqscr9h6jUTOJvqv72MoY=\n",
"iv": "ouTWKLraRXvsyXVTRfY33Q==\n",
"version": 1,
"cipher": "aes-256-cbc"
},
"file-content": {
"encrypted_data": "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\nnDAoqfP4fCg7nvLTewTL0n3q\n", "encrypted_data": "3WmC4wGAU9EGK+P2NAf6gdrQ4aHYIZioo6eE6h9c6Jb76q4pGRZFElkVC+je\nsaeW8Z5iNthIq7sYcCYm7rVfof8UbNyBmCa6/AzJNb+zRAftWl17dXVP2X0/\nTTrE6A5Yyv7N/pn43BzmbfugWuo2fYZoLVgWqUAfpJp4cBi2vRpygZ8eJlC9\nOy9fLeZp4dRoU8aIO3+mR+dOk/ZjyQlqYcmd3VmR60UTeE4j0AwotCAJCZQ+\nVhMwkqJn1/7H9TgUQvVwCyGKv7/ORWXrPd3bNjhm91f8Lxl3ZsbpAA5MJgPj\nborBPLU9WXi2F19Ot6b/pSEMIH6w1aTsztOxD+iykrRUEUyTfaOxdglVcSvR\nYHxTAEHBF8lF5y4ITGYP3y0qzq4PCLd/LpwM6jyQfr7/7b5HYlSouYz+1L7K\nQGx8/9Cm72qYJIzzk3o9Prl9sNEkf0yOUeMsNC0VxiEU0/NQLKTwItvDQgZV\nb/X9yTLwtd9Pd+z00OxQJcVSv3vN9oVxmx6Ds6TDCCO7JX66Ny9x+PtfnuCR\nSE3T5rlQ6zj3hnxi+bBbWjNIxcxWU5YxH36mCYI4HwUSnnugmr17hoF5ZPtN\nAnDQyVK7zV6/+/+oyRV9isnMYjfTcHiUfujRCqakN6ymsGROY6oIlLxiGd90\n0Bk1gZN6aJbRhguSswTe822jkwNd5EHoroYsaTITKCOV/FgyFarx+dhtT2EC\nzszgRlN12WvNRRLHXLS4RSSvEtzvV9vSxN5GZtYPMLoYoEWm+u0EUMuYgenU\nlWFA1FrBs28DntXe4+MKa99mPCkJ81cKMGHdVnPmr5kiIVZ9skou74h/t1qm\nVgg6MRDXiL7SEqZIbCdJJfsqCzlyXMXnLXkz/KnTHc7dBxDodH+CGIUh9bG/\nowwDoR4xhowvfR9hDPM0ajFqnVQDSCh4B5MuocAB91mI6xiE5nH2S1WrSnZs\no31Mn7DMcJTlpesFQDPYaQJZcFJ6//xgqX7fEc98NwFxC6LBuIej7n5+Gq6o\nc7l4yQT+v8y2crMbyrUm6C2duewI+dlIvdLWTCrwWhHgbXpyC4Com7Doda3Q\nbxtqF5pxna6WnLrphDvL7jyBM+50hh+tX62GycU8dhQ2vIPnsZjPMpYQ9n2f\nnHNvwn8bbloSUq3i2go+oid5bgtFB/Aoed33yOcT3LbEKgHys0xNY6r+Clu5\nKwBst/au2e9cyrOYh3hJbnUjC7w2hZSOrEQTzAnh3qMGv0iNC8h7FnNWhK+R\nXYOhdGmkhKHYzvb4dj/5ZHHyzq6BOW73ujP1GB6kFCDlWe0Cm26CNEn6GBmP\nyHfui9uaWuH4+gQw/4hoDcSHsCE/xq+TfP9Pb9q9JzdpYd6FfvCk2MdjKCS/\nWUXAk4d2Y2/UwURp5fvzzIdePvQmt/jU2brUEE+9/lch5b+3E9jPTd1GJH40\neXi6dr0UHP9Wyf9Lz1hqXjknDQOtxfLy8kYefrurWSGGawvyFBozCh0YnwEI\ndTasDdgkKmF5cVRopmQjjgXPWEyT42AhI9kdKCgWXrLYgF9StWFmw0FGWX7O\nbB0HEEDWmsocu8iTqLIQ9OB8FQZ0sD+VhO18NK0idYmgdjjKWakou65ANHQd\nXGg4UwfKV7HalWmsc8HEvP6no+qt7W3Egz7prLkDB2H5hIo7iL7cOXRgE6/J\nI6e3Fe0DTAUav6Q3rsSBusdk0dDkOBpwxSPyMH8JKhjJoRa3NBKL3cizUYRs\n5HpGcVl3rEJtVdSmdfUGMMELXMcA+M9KPiZi2LCQtx9vTS1NYa+2Y6UY3ZBA\n/YTUgk1MCdVqemDXOVR6Bm58XUqf8Z1DQM8/LLsS27IehdpsIS4XmnLk5CP6\n+jDzlT+C5lDaKumJQHyFcHby7sk+WeArELkBFDT6AY1A1NQrN3rgn5afiqtc\nR+GbIosh95Ubv5ARR698AiGA2E/hnAOxgtrstElRtQ5ELaJf6Ol8io0FzmPJ\nVsCmKamEmrQVDUL17xBXizkmHZ7o5vOBdEA06g/w0qVutKoyimUyPzrQdiRa\nvLnb253UTIhrxq8a68w7BfBp2PJOhpE2L3FMPEbDkV9NcaqIMd2F87iII4ul\nonh4Lq1P8cfpLWGMYqR4+SbTi1xVAdDlxQIYMWauEth+HVV+FYfWo121GRkI\nkBgACULbHS/GbuqVa1BkLnG5u34mjpoFPRBRK59tW0eE84vfXFvXnsPQLmNq\nG8HzDuu7RVLKE2W0tvJUHsUfMWIgslXdzJTTSTdem5Rmqoq8OK2+VJGEPR1i\nnDAoqfP4fCg7nvLTewTL0n3q\n",
"iv": "KXWFfo59jv62ci0wXKf8xQ==\n", "iv": "KXWFfo59jv62ci0wXKf8xQ==\n",
"version": 1, "version": 1,

View File

@ -1,12 +1,6 @@
{ {
"id": "horizon.pem", "id": "horizon.pem",
"file-name": { "horizon.pem": {
"encrypted_data": "Mp8RDUMPwqcgDEFmdfXnlcoM5g36oBUpmAK9WWxSwu4=\n",
"iv": "7R0KgKPCirB0pzhbvLMiXA==\n",
"version": 1,
"cipher": "aes-256-cbc"
},
"file-content": {
"encrypted_data": "rHEpgrAC117fgp+lqsj1q5K5QgEip3AyYjdS88rZurpiuUPBipURSz1x9SBf\ndWfva9xk+zDeFSu+hYZUanzg7eUzYcp12oVQiz42Cu4XMbK7+AFEFXa0dzUI\nkXeqrc1yffftK4y/y12mxlzKzhHTaJ+YbVxqanQrLJo1oBh4gbEddztdc0Q/\nyVB2TtbhqUVmi/fSoAqtGFnppoPvXw6lk/rQroFpwBGlxxX9l4l7q3Wrpdea\n1SzweAYfBB2UQuCrJHnz2it5/SLKOHBKlngcRZXQk4rzljOJd/fh9WPLZOQs\nqfBa7i666HOFb27ArNcPoKDrQNbermmYFpnF1NqtEjF0v6fpKmd4G1TQmOde\n40Q16o2Y+Uu6LV0iV+6d+PhJpuxRKdpy8bMRtkzJRn43/4lmf/QpgvyZmjcs\n7DhtzZkUkH9yS+wKZx6yo3DFW8uIWSO3wUk40BLCzySQIkYmrth2e4afABKI\nTGd/5UKEsyAqRc2CEZ1GZSumgLOevrIpSfsego7GSmcAcOuuBr3xqNgC9rV3\n3L5Hd3QaGe0BTZ2Ss4yE6DpKRMoYIubu0bWwoVppNogX2IfHCjfFffg3jIaq\n6mYbq/Km8YGlUCujmsJcSI6IYaYA9tPxAwMcc0AZysVgQe3ikXcLtL2wZK5C\nAm4cD3l8Ynt9YENODLjybFlzNxjX9b7DTtgdSAjp45QV//NKYwy69Xqagx29\ng7XQK5WWtQyOHVufNCWkEqTdyAbX+AFn19qpV3WGr9mT2oXjec/P7bK9b575\n2ISya0b9IYuu8iLVy9crSQZ7fjro0Z7aEnaBq+yUV/CTGGv92oCQ6sPvn5Pw\ndp3uNvuhSZfI6D57gs98Ltl9rpgINqWCDfR2r84HI+7n85FX56YLAjyQFfha\nwV+k4SjNdBKFVsv8YxseRWMHpExuhv2xQzOABrrNLh1WT/hHorp5cgqElrgS\n8pB/2Vet9L8irhZePuJeIR4o0eTDueJfpzmZTrhTpQ5gRBJY4a/YgewjZjt8\nXGYX6CrO5kCA2A0dDK2uj+ECBj00bQ1LpJ90cqftgPNbaA00uI+K7c/JCXyw\n6yRrCCM0O6BBaDzAbbkrMnqDPMGgNF0nCaxyekK40EKXCd4VhmuaABtKWDvb\nWmY2314G5AppsILrgC4bpvjPxTvmuKJvlACbVdVVEySDj/dbGPnNL0OTDqSF\n4iVAQ32p/ALF8cb5aR9lXx0rF7RmboGWLHHv76vW1C/wu5KWt+2Q93+0imX0\nnvOMipFzpO3TfNds32IqerBjs5SaE6JC1lWIS7aBRnQmu3lDW6bV9S02S8HH\nme3Cqo2v0N5Wfz1+++JrJzlwnQ3FZ+4Bmxu4T4Y+S2ValFp1Fz/2scjmSg2e\nlHWhpyzD648fIG2TjxNZ8fY07+DK\n", "encrypted_data": "rHEpgrAC117fgp+lqsj1q5K5QgEip3AyYjdS88rZurpiuUPBipURSz1x9SBf\ndWfva9xk+zDeFSu+hYZUanzg7eUzYcp12oVQiz42Cu4XMbK7+AFEFXa0dzUI\nkXeqrc1yffftK4y/y12mxlzKzhHTaJ+YbVxqanQrLJo1oBh4gbEddztdc0Q/\nyVB2TtbhqUVmi/fSoAqtGFnppoPvXw6lk/rQroFpwBGlxxX9l4l7q3Wrpdea\n1SzweAYfBB2UQuCrJHnz2it5/SLKOHBKlngcRZXQk4rzljOJd/fh9WPLZOQs\nqfBa7i666HOFb27ArNcPoKDrQNbermmYFpnF1NqtEjF0v6fpKmd4G1TQmOde\n40Q16o2Y+Uu6LV0iV+6d+PhJpuxRKdpy8bMRtkzJRn43/4lmf/QpgvyZmjcs\n7DhtzZkUkH9yS+wKZx6yo3DFW8uIWSO3wUk40BLCzySQIkYmrth2e4afABKI\nTGd/5UKEsyAqRc2CEZ1GZSumgLOevrIpSfsego7GSmcAcOuuBr3xqNgC9rV3\n3L5Hd3QaGe0BTZ2Ss4yE6DpKRMoYIubu0bWwoVppNogX2IfHCjfFffg3jIaq\n6mYbq/Km8YGlUCujmsJcSI6IYaYA9tPxAwMcc0AZysVgQe3ikXcLtL2wZK5C\nAm4cD3l8Ynt9YENODLjybFlzNxjX9b7DTtgdSAjp45QV//NKYwy69Xqagx29\ng7XQK5WWtQyOHVufNCWkEqTdyAbX+AFn19qpV3WGr9mT2oXjec/P7bK9b575\n2ISya0b9IYuu8iLVy9crSQZ7fjro0Z7aEnaBq+yUV/CTGGv92oCQ6sPvn5Pw\ndp3uNvuhSZfI6D57gs98Ltl9rpgINqWCDfR2r84HI+7n85FX56YLAjyQFfha\nwV+k4SjNdBKFVsv8YxseRWMHpExuhv2xQzOABrrNLh1WT/hHorp5cgqElrgS\n8pB/2Vet9L8irhZePuJeIR4o0eTDueJfpzmZTrhTpQ5gRBJY4a/YgewjZjt8\nXGYX6CrO5kCA2A0dDK2uj+ECBj00bQ1LpJ90cqftgPNbaA00uI+K7c/JCXyw\n6yRrCCM0O6BBaDzAbbkrMnqDPMGgNF0nCaxyekK40EKXCd4VhmuaABtKWDvb\nWmY2314G5AppsILrgC4bpvjPxTvmuKJvlACbVdVVEySDj/dbGPnNL0OTDqSF\n4iVAQ32p/ALF8cb5aR9lXx0rF7RmboGWLHHv76vW1C/wu5KWt+2Q93+0imX0\nnvOMipFzpO3TfNds32IqerBjs5SaE6JC1lWIS7aBRnQmu3lDW6bV9S02S8HH\nme3Cqo2v0N5Wfz1+++JrJzlwnQ3FZ+4Bmxu4T4Y+S2ValFp1Fz/2scjmSg2e\nlHWhpyzD648fIG2TjxNZ8fY07+DK\n",
"iv": "lkc95ZL49FE6ntwgPq7QVA==\n", "iv": "lkc95ZL49FE6ntwgPq7QVA==\n",
"version": 1, "version": 1,

View File

@ -6,12 +6,18 @@
"json_class": "Chef::Environment", "json_class": "Chef::Environment",
"chef_type": "environment", "chef_type": "environment",
"default_attributes": { "default_attributes": {
"apache": {
"listen": []
},
"apt": { "apt": {
"compile_time_update" : true "compile_time_update" : true
} }
}, },
"override_attributes": { "override_attributes": {
"openstack": { "openstack": {
"dashboard": {
"server_hostname": "localhost"
},
"mq": { "mq": {
"user": "admin" "user": "admin"
}, },