summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLogan V <logan2211@gmail.com>2019-03-16 13:07:02 -0500
committerLogan V <logan2211@gmail.com>2019-03-16 13:07:02 -0500
commitb4509a79d40055bb5cdd9a5c5e275e0e14e663e1 (patch)
tree88fb3e60e641f143eaab42af442007bd0384ac19
parentd90d17933d3402e8df1af105c402da1ad7b61655 (diff)
Remove ELK from dynamic inventory layout
Notes
Notes (review): Code-Review+2: Logan V <logan2211@gmail.com> Workflow+1: Logan V <logan2211@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 16 Mar 2019 18:29:34 +0000 Reviewed-on: https://review.openstack.org/643709 Project: openstack/limestone-ci-cloud Branch: refs/heads/master
-rw-r--r--openstack_deploy/env.d/elk.yml61
-rw-r--r--openstack_deploy/openstack_inventory.json228
2 files changed, 2 insertions, 287 deletions
diff --git a/openstack_deploy/env.d/elk.yml b/openstack_deploy/env.d/elk.yml
deleted file mode 100644
index 010389e..0000000
--- a/openstack_deploy/env.d/elk.yml
+++ /dev/null
@@ -1,61 +0,0 @@
1---
2component_skel:
3 apm-server:
4 belongs_to:
5 - elk_all
6 - apm_all
7 elastic-logstash:
8 belongs_to:
9 - elk_all
10 - elasticsearch
11 - elasticsearch_all
12 - logstash
13 - logstash_all
14 kibana:
15 belongs_to:
16 - elk_all
17
18# Note this is all running "is_metal" This is done because the services will run
19# from a dedicated VM.
20container_skel:
21 apm-server_container:
22 belongs_to:
23 - apm-server_containers
24 contains:
25 - apm-server
26 properties:
27 is_metal: true
28 elastic-logstash_container:
29 belongs_to:
30 - elastic-logstash_containers
31 contains:
32 - elastic-logstash
33 properties:
34 is_metal: true
35 kibana_container:
36 belongs_to:
37 - kibana_containers
38 contains:
39 - kibana
40 properties:
41 is_metal: true
42
43physical_skel:
44 apm-server_containers:
45 belongs_to:
46 - all_containers
47 apm-server_hosts:
48 belongs_to:
49 - hosts
50 elastic-logstash_containers:
51 belongs_to:
52 - all_containers
53 elastic-logstash_hosts:
54 belongs_to:
55 - hosts
56 kibana_containers:
57 belongs_to:
58 - all_containers
59 kibana_hosts:
60 belongs_to:
61 - hosts
diff --git a/openstack_deploy/openstack_inventory.json b/openstack_deploy/openstack_inventory.json
index 0ce7c1c..72eea02 100644
--- a/openstack_deploy/openstack_inventory.json
+++ b/openstack_deploy/openstack_inventory.json
@@ -8,87 +8,6 @@
8 }, 8 },
9 "_meta": { 9 "_meta": {
10 "hostvars": { 10 "hostvars": {
11 "elk1": {
12 "ansible_host": "10.4.70.59",
13 "component": "apm-server",
14 "container_address": "10.4.70.59",
15 "container_name": "elk1",
16 "container_networks": {
17 "container_address": {
18 "address": "10.4.70.59",
19 "bridge": "br-mgmt",
20 "netmask": "255.255.255.0",
21 "static_routes": [
22 {
23 "cidr": "10.4.69.0/24",
24 "gateway": "10.53.2.1"
25 }
26 ],
27 "type": "veth"
28 }
29 },
30 "container_types": "elk1-host_containers",
31 "is_metal": true,
32 "physical_host": "elk1",
33 "physical_host_group": "apm-server_hosts",
34 "properties": {
35 "is_metal": true
36 }
37 },
38 "elk2": {
39 "ansible_host": "10.4.70.31",
40 "component": "apm-server",
41 "container_address": "10.4.70.31",
42 "container_name": "elk2",
43 "container_networks": {
44 "container_address": {
45 "address": "10.4.70.31",
46 "bridge": "br-mgmt",
47 "netmask": "255.255.255.0",
48 "static_routes": [
49 {
50 "cidr": "10.4.69.0/24",
51 "gateway": "10.53.2.1"
52 }
53 ],
54 "type": "veth"
55 }
56 },
57 "container_types": "elk2-host_containers",
58 "is_metal": true,
59 "physical_host": "elk2",
60 "physical_host_group": "apm-server_hosts",
61 "properties": {
62 "is_metal": true
63 }
64 },
65 "elk3": {
66 "ansible_host": "10.4.70.67",
67 "component": "apm-server",
68 "container_address": "10.4.70.67",
69 "container_name": "elk3",
70 "container_networks": {
71 "container_address": {
72 "address": "10.4.70.67",
73 "bridge": "br-mgmt",
74 "netmask": "255.255.255.0",
75 "static_routes": [
76 {
77 "cidr": "10.4.69.0/24",
78 "gateway": "10.53.2.1"
79 }
80 ],
81 "type": "veth"
82 }
83 },
84 "container_types": "elk3-host_containers",
85 "is_metal": true,
86 "physical_host": "elk3",
87 "physical_host_group": "apm-server_hosts",
88 "properties": {
89 "is_metal": true
90 }
91 },
92 "lsn-d5497": { 11 "lsn-d5497": {
93 "ansible_host": "10.4.69.14", 12 "ansible_host": "10.4.69.14",
94 "component": "ceph-osd", 13 "component": "ceph-osd",
@@ -1654,10 +1573,7 @@
1654 "storage-infra_containers", 1573 "storage-infra_containers",
1655 "identity_containers", 1574 "identity_containers",
1656 "dnsaas_containers", 1575 "dnsaas_containers",
1657 "qemu-compute_containers", 1576 "qemu-compute_containers"
1658 "apm-server_containers",
1659 "kibana_containers",
1660 "elastic-logstash_containers"
1661 ], 1577 ],
1662 "hosts": [] 1578 "hosts": []
1663 }, 1579 },
@@ -1689,45 +1605,6 @@
1689 "children": [], 1605 "children": [],
1690 "hosts": [] 1606 "hosts": []
1691 }, 1607 },
1692 "apm-server": {
1693 "children": [],
1694 "hosts": [
1695 "elk2",
1696 "elk3",
1697 "elk1"
1698 ]
1699 },
1700 "apm-server_all": {
1701 "hosts": [
1702 "elk2",
1703 "elk3",
1704 "elk1"
1705 ]
1706 },
1707 "apm-server_container": {
1708 "hosts": []
1709 },
1710 "apm-server_containers": {
1711 "children": [
1712 "elk2-host_containers",
1713 "elk3-host_containers",
1714 "elk1-host_containers"
1715 ],
1716 "hosts": []
1717 },
1718 "apm-server_hosts": {
1719 "hosts": [
1720 "elk2",
1721 "elk3",
1722 "elk1"
1723 ]
1724 },
1725 "apm_all": {
1726 "children": [
1727 "apm-server"
1728 ],
1729 "hosts": []
1730 },
1731 "barbican_all": { 1608 "barbican_all": {
1732 "children": [ 1609 "children": [
1733 "barbican_api" 1610 "barbican_api"
@@ -2065,59 +1942,6 @@
2065 "children": [], 1942 "children": [],
2066 "hosts": [] 1943 "hosts": []
2067 }, 1944 },
2068 "elastic-logstash": {
2069 "children": [],
2070 "hosts": [
2071 "elk2",
2072 "elk3",
2073 "elk1"
2074 ]
2075 },
2076 "elastic-logstash_all": {
2077 "hosts": [
2078 "elk2",
2079 "elk3",
2080 "elk1"
2081 ]
2082 },
2083 "elastic-logstash_container": {
2084 "hosts": []
2085 },
2086 "elastic-logstash_containers": {
2087 "children": [
2088 "elk2-host_containers",
2089 "elk3-host_containers",
2090 "elk1-host_containers"
2091 ],
2092 "hosts": []
2093 },
2094 "elastic-logstash_hosts": {
2095 "hosts": [
2096 "elk2",
2097 "elk3",
2098 "elk1"
2099 ]
2100 },
2101 "elasticsearch": {
2102 "children": [
2103 "elastic-logstash"
2104 ],
2105 "hosts": []
2106 },
2107 "elasticsearch_all": {
2108 "children": [
2109 "elastic-logstash"
2110 ],
2111 "hosts": []
2112 },
2113 "elk_all": {
2114 "children": [
2115 "kibana",
2116 "elastic-logstash",
2117 "apm-server"
2118 ],
2119 "hosts": []
2120 },
2121 "etcd": { 1945 "etcd": {
2122 "children": [], 1946 "children": [],
2123 "hosts": [] 1947 "hosts": []
@@ -2366,10 +2190,7 @@
2366 "metering-alarm_hosts", 2190 "metering-alarm_hosts",
2367 "ceph-mon_hosts", 2191 "ceph-mon_hosts",
2368 "metrics_hosts", 2192 "metrics_hosts",
2369 "storage_hosts", 2193 "storage_hosts"
2370 "apm-server_hosts",
2371 "elastic-logstash_hosts",
2372 "kibana_hosts"
2373 ], 2194 ],
2374 "hosts": [] 2195 "hosts": []
2375 }, 2196 },
@@ -2518,39 +2339,6 @@
2518 "lsn-mc1022_keystone_container-e0c88868" 2339 "lsn-mc1022_keystone_container-e0c88868"
2519 ] 2340 ]
2520 }, 2341 },
2521 "kibana": {
2522 "children": [],
2523 "hosts": [
2524 "elk2",
2525 "elk3",
2526 "elk1"
2527 ]
2528 },
2529 "kibana_all": {
2530 "hosts": [
2531 "elk2",
2532 "elk3",
2533 "elk1"
2534 ]
2535 },
2536 "kibana_container": {
2537 "hosts": []
2538 },
2539 "kibana_containers": {
2540 "children": [
2541 "elk2-host_containers",
2542 "elk3-host_containers",
2543 "elk1-host_containers"
2544 ],
2545 "hosts": []
2546 },
2547 "kibana_hosts": {
2548 "hosts": [
2549 "elk2",
2550 "elk3",
2551 "elk1"
2552 ]
2553 },
2554 "kvm-compute_containers": { 2342 "kvm-compute_containers": {
2555 "children": [], 2343 "children": [],
2556 "hosts": [] 2344 "hosts": []
@@ -2567,18 +2355,6 @@
2567 "children": [], 2355 "children": [],
2568 "hosts": [] 2356 "hosts": []
2569 }, 2357 },
2570 "logstash": {
2571 "children": [
2572 "elastic-logstash"
2573 ],
2574 "hosts": []
2575 },
2576 "logstash_all": {
2577 "children": [
2578 "elastic-logstash"
2579 ],
2580 "hosts": []
2581 },
2582 "lsn-mc1016-host_containers": { 2358 "lsn-mc1016-host_containers": {
2583 "hosts": [ 2359 "hosts": [
2584 "lsn-mc1016_nova_api_container-3361da12", 2360 "lsn-mc1016_nova_api_container-3361da12",