diff options
7 files changed, 119 insertions, 213 deletions
diff --git a/site/intel-pod10/software/charts/osh-infra/elasticsearch.yaml b/site/intel-pod10/software/charts/osh-infra/elasticsearch.yaml deleted file mode 100644 index ef0a42e..0000000 --- a/site/intel-pod10/software/charts/osh-infra/elasticsearch.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: elasticsearch - labels: - name: elasticsearch-type - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: elasticsearch-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - master: 2 - data: 1 - client: 2 - storage: - requests: - storage: 20Gi - conf: - elasticsearch: - env: - java_opts: - client: "-Xms2048m -Xmx2048m" - data: "-Xms2048m -Xmx2048m" - master: "-Xms2048m -Xmx2048m" -... diff --git a/site/intel-pod15/networks/common-addresses.yaml b/site/intel-pod15/networks/common-addresses.yaml index 3f25a03..f4e8134 100644 --- a/site/intel-pod15/networks/common-addresses.yaml +++ b/site/intel-pod15/networks/common-addresses.yaml @@ -154,11 +154,11 @@ data: # Interface for the OpenStack external network. Ensure the interface name is # consistent with the interface and VLAN assigned to the Public network in # networks/physical/networks.yaml - external_iface: 'ens785f0.4000' + external_iface: 'ens785f0.1153' openvswitch: # Interface for the OpenStack external network. Ensure the interface name is # consistent with the interface and VLAN assigned to the Public network in # networks/physical/networks.yaml - external_iface: 'ens785f0.4000' + external_iface: 'ens785f0.1153' ... diff --git a/site/intel-pod15/networks/physical/networks.yaml b/site/intel-pod15/networks/physical/networks.yaml index 659884e..5bf1a29 100644 --- a/site/intel-pod15/networks/physical/networks.yaml +++ b/site/intel-pod15/networks/physical/networks.yaml @@ -12,7 +12,7 @@ # |IF2 10G | private | Underlay calico and ovs overlay | VLAN 152 | untagged | 10.10.152.0/24 | # | | management | Management (unused for now) | VLAN 154 | tagged | 10.10.154.0/24 | # |IF3 10G | storage | Storage network | VLAN 153 | untagged | 10.10.153.0/24 | -# | | public | Public network for VMs | VLAN 4000| tagged | 10.10.155.0/24 | +# | | public | Public network for VMs | VLAN 1153| tagged | 10.10.155.0/24 | # +--------+------------+-----------------------------------+----------+----------+----------------+ # # For standard Airship deployments, you should not need to modify the number of @@ -307,7 +307,7 @@ data: ... --- # The public network for OpenStack VMs. -# NOTE: Only interface 'ens785f0.4000' will be setup, no IPs assigned to hosts +# NOTE: Only interface 'ens785f0.1153' will be setup, no IPs assigned to hosts schema: 'drydock/Network/v1' metadata: schema: 'metadata/Document/v1' @@ -318,7 +318,7 @@ metadata: storagePolicy: cleartext data: # NEWSITE-CHANGEME: Set the VLAN ID which the Public network is on - vlan: '4000' + vlan: '1153' # NEWSITE-CHANGEME: Ensure the network switches in the environment are # configured for this MTU or greater. mtu: 1500 diff --git a/site/intel-pod15/software/charts/osh-infra/elasticsearch.yaml b/site/intel-pod15/software/charts/osh-infra/elasticsearch.yaml deleted file mode 100644 index ef0a42e..0000000 --- a/site/intel-pod15/software/charts/osh-infra/elasticsearch.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: elasticsearch - labels: - name: elasticsearch-type - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: elasticsearch-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - master: 2 - data: 1 - client: 2 - storage: - requests: - storage: 20Gi - conf: - elasticsearch: - env: - java_opts: - client: "-Xms2048m -Xmx2048m" - data: "-Xms2048m -Xmx2048m" - master: "-Xms2048m -Xmx2048m" -... diff --git a/site/intel-pod17/software/charts/osh-infra/elasticsearch.yaml b/site/intel-pod17/software/charts/osh-infra/elasticsearch.yaml deleted file mode 100644 index 2f7b3c1..0000000 --- a/site/intel-pod17/software/charts/osh-infra/elasticsearch.yaml +++ /dev/null @@ -1,70 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: elasticsearch - labels: - name: elasticsearch-type - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: elasticsearch-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - client: 3 - resources: - enabled: true - apache_proxy: - limits: - memory: "1024Mi" - cpu: "2000m" - requests: - memory: "0" - cpu: "0" - client: - requests: - memory: "4Gi" - cpu: "1000m" - limits: - memory: "8Gi" - cpu: "2000m" - master: - requests: - memory: "4Gi" - cpu: "1000m" - limits: - memory: "8Gi" - cpu: "2000m" - data: - requests: - memory: "4Gi" - cpu: "1000m" - limits: - memory: "8Gi" - cpu: "2000m" - prometheus_elasticsearch_exporter: - requests: - memory: "0" - cpu: "0" - limits: - memory: "1024Mi" - cpu: "2000m" - - storage: - requests: - storage: 10Gi - conf: - elasticsearch: - env: - java_opts: - client: "-Xms2048m -Xmx2048m" - data: "-Xms2048m -Xmx2048m" - master: "-Xms2048m -Xmx2048m" -... diff --git a/site/intel-pod18/software/charts/osh-infra/elasticsearch.yaml b/site/intel-pod18/software/charts/osh-infra/elasticsearch.yaml deleted file mode 100644 index 2f7b3c1..0000000 --- a/site/intel-pod18/software/charts/osh-infra/elasticsearch.yaml +++ /dev/null @@ -1,70 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: elasticsearch - labels: - name: elasticsearch-type - layeringDefinition: - abstract: false - layer: site - parentSelector: - hosttype: elasticsearch-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - pod: - replicas: - client: 3 - resources: - enabled: true - apache_proxy: - limits: - memory: "1024Mi" - cpu: "2000m" - requests: - memory: "0" - cpu: "0" - client: - requests: - memory: "4Gi" - cpu: "1000m" - limits: - memory: "8Gi" - cpu: "2000m" - master: - requests: - memory: "4Gi" - cpu: "1000m" - limits: - memory: "8Gi" - cpu: "2000m" - data: - requests: - memory: "4Gi" - cpu: "1000m" - limits: - memory: "8Gi" - cpu: "2000m" - prometheus_elasticsearch_exporter: - requests: - memory: "0" - cpu: "0" - limits: - memory: "1024Mi" - cpu: "2000m" - - storage: - requests: - storage: 10Gi - conf: - elasticsearch: - env: - java_opts: - client: "-Xms2048m -Xmx2048m" - data: "-Xms2048m -Xmx2048m" - master: "-Xms2048m -Xmx2048m" -... diff --git a/type/cntt/software/charts/osh-infra/elasticsearch.yaml b/type/cntt/software/charts/osh-infra/elasticsearch.yaml new file mode 100644 index 0000000..6a65676 --- /dev/null +++ b/type/cntt/software/charts/osh-infra/elasticsearch.yaml @@ -0,0 +1,114 @@ +--- +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: elasticsearch + labels: + name: elasticsearch-type + layeringDefinition: + abstract: false + layer: type + parentSelector: + hosttype: elasticsearch-global + actions: + - method: merge + path: . + storagePolicy: cleartext +data: + values: + pod: + replicas: + master: 3 + data: 3 + client: 3 + resources: + enabled: true + apache_proxy: + limits: + memory: "1024Mi" + cpu: "2000m" + requests: + memory: "0" + cpu: "0" + client: + requests: + memory: "4Gi" + cpu: "1000m" + limits: + memory: "8Gi" + cpu: "2000m" + master: + requests: + memory: "4Gi" + cpu: "1000m" + limits: + memory: "8Gi" + cpu: "2000m" + data: + requests: + memory: "4Gi" + cpu: "1000m" + limits: + memory: "8Gi" + cpu: "2000m" + prometheus_elasticsearch_exporter: + requests: + memory: "0" + cpu: "0" + limits: + memory: "1024Mi" + cpu: "2000m" + + storage: + requests: + storage: 50Gi + conf: + elasticsearch: + env: + java_opts: + client: "-Xms2048m -Xmx2048m" + data: "-Xms2048m -Xmx2048m" + master: "-Xms2048m -Xmx2048m" + curator: + #run every 6th hour + schedule: "0 */6 * * *" + action_file: + actions: + 1: + action: delete_indices + description: >- + "Delete indices older than 1 days" + options: + timeout_override: + continue_if_exception: False + ignore_empty_list: True + disable_action: False + filters: + - filtertype: pattern + kind: prefix + value: logstash- + - filtertype: age + source: name + direction: older + timestring: '%Y.%m.%d' + unit: days + unit_count: 1 + 2: + action: delete_indices + description: >- + "Delete indices by age if available disk space is + less than 80% total disk" + options: + timeout_override: 600 + continue_if_exception: False + ignore_empty_list: True + disable_action: False + filters: + - filtertype: pattern + kind: prefix + value: logstash- + - filtertype: space + source: creation_date + use_age: True + disk_space: 120 +... |