Skip to content
Snippets Groups Projects
Commit a4a37f7f authored by Mark Beierl's avatar Mark Beierl
Browse files

Merge v8.0 Into Master


This is a combination of all the commits.

=======================================================================

Enable Robot Tests

Enabling robot tests in CI/CD pipeline
Propagate the parameter DO_ROBOT to stage_3-merge
Setting OSM_HOSTNAME for robot test execution
Adding prometheus_hostname env variable for ci/cd tests
Archive containers logs in robot test execution

Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>
Author: Felipe Vicens <felipe.vicens@atos.net>

8716 - K8s Proxy Charms

This commit contains the following changes:

- Changes to LCM Charm to configure vca k8s cloud
- K8s installation:
  - Add storageclass to K8s
  - Add k8s to VCA
  - Configure lcm.env to pass k8s cloud name
- Pass k8s cloud name to LCM Charm in charmed
installation
- Pin juju version tu 2.8/stable
- Instal juju after Microk8s in charmed
installation

Signed-off-by: default avatarDominik Fleischmann <dominik.fleischmann@canonical.com>

Add PLA charm

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Add NG-UI Charm

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Fix bugs in NG-UI charm

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Updated Dockerfiles to use ReleaseEIGHT-daily repo by default

Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>

Fix bug 1124: K8s added to juju after k8s has been initialized

Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>

Helm and k8s storage initialization for k8s-based installation

Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>

Fix bug 1125: iptables must be installed and configured if not present

Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>

Fix bug 1129: juju_addk8s requires the storage class

Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>

Fix issue in UI charm

Scale policy is only available in stateful pods

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Adds image overlay to bundle

When installing using a bundle, the image overlay was not being
generated, resulting in the --tag option being ignored.

Bug 1130

Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>

Fix uninstall process, will fix issues is daily-stage4

Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>

Fix PLA relations, add missing ENVs, and include it in the bundle

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Fix 1127 bug: Use config instead of resources for SSL certificates

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Remove unused config from PLA overlayx

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Installer: refactor file generation, improved ng-ui and light-ui separation, fixes in PLA

Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>

Pin libjuju version to 2.8.2

This fixes bug 1144

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Pin libjuju version to 2.8.2

Fixes bug 1144

Signed-off-by: default avatarMark Beierl <mark.beierl@canonical.com>

Remove api_proxy variable in charmed installer

- Fixes bug 1154

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Add waiting period to Storage Class creation

This commit adds a waiting period until the
storage class is available.

It also fixes a minor bug in the juju add-k8s
command.

This fixes Bug 1155

Signed-off-by: default avatarDominik Fleischmann <dominik.fleischmann@canonical.com>

Remove api_proxy from osm bundles

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Make Charmed Installer Idempotent

By default, the charmed installer will create a controller called
'controller', unless an external VCA is specified using the --vca
option.  Upon uninstall, it is not known or safe to remove this
Juju controller as there might be other applications using it.

This change shows that message on uninstall, giving the user the
opportunity to remove it with a command.

Also, as part of the installation, this change checks for the
controller and if it exists, presents the user with options for
how to resolve the situation.

Fixes bug 1126

Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>

Remove unneeded mysql interface in PLA, fix osm-ha bundle, and add README.md to bundles

Signed-off-by: default avatarDavid Garcia <david.garcia@canonical.com>

Expose NBI and NG-UI

Adds ingress rules for K8s installation to expose the NBI, the
NG-UI and allow for unlimited content size.

Fixes bug 1171

Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>

Installer Quits Too Soon

Increases the timeout and provides more feedback on progress.

Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>

Change in returned storage status format from microk8s

Signed-off-by: default avatarcalvinosanc1 <guillermo.calvino@canonical.com>

========================================================================================

Change-Id: I9223675bb9ad25a0da1f20215e79ef392e544eb5
Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>
parent 1a423a46
No related branches found
No related tags found
No related merge requests found
Showing
with 272 additions and 114 deletions
# Copyright 2020 Canonical Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
[submodule "installers/charm/pla/mod/operator"]
path = installers/charm/pla/mod/operator
url = https://github.com/canonical/operator
[submodule "installers/charm/ng-ui/mod/operator"]
path = installers/charm/ng-ui/mod/operator
url = https://github.com/canonical/operator
......@@ -70,7 +70,7 @@ RUN curl -L https://launchpad.net/juju/2.7/2.7.6/+download/juju-2.7.6-k8s.tar.xz
&& mv juju /usr/local/bin/juju
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseSEVEN-daily
ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
......
......@@ -45,7 +45,7 @@ RUN pip3 install 'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \
'paramiko' 'dogpile.cache==0.9.2'
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseFOUR-daily
ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
......
......@@ -29,7 +29,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git pyth
&& mkdir -p /app/storage/kafka && mkdir -p /app/log
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseFOUR-daily
ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
......
......@@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y curl xz-utils gnupg2 \
&& apt-get install -y nginx
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseSEVEN-daily
ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
ARG NGUI_VERSION
......
......@@ -24,7 +24,7 @@ RUN apt-get --yes update \
&& python3 -m pip install pymzn==0.18.3
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseFOUR-daily
ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
......
......@@ -30,7 +30,7 @@ RUN apt-get --yes update \
&& pip3 install pip==9.0.3
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseFOUR-daily
ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
......
......@@ -24,7 +24,7 @@ RUN apt-get update && apt-get -y install curl software-properties-common git tox
&& python3 -m pip install --upgrade pip && python3 -m pip install pyangbind networking-l2gw
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseSEVEN-daily
ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
......
......@@ -20,7 +20,7 @@ RUN ln -s /usr/bin/nodejs /usr/bin/node
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseFOUR-daily
ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
ARG LWUI_VERSION
......
......@@ -22,7 +22,7 @@ all: build
TAG ?= 6
REPOSITORY_BASE ?= http://osm-download.etsi.org/repository/osm/debian
RELEASE ?= ReleaseFOUR-daily
RELEASE ?= ReleaseEIGHT-daily
REPOSITORY_KEY ?= OSM%20ETSI%20Release%20Key.gpg
REPOSITORY ?= testing
NO_CACHE ?= --no-cache
......
#!/bin/sh
#
# Copyright 2020 ETSI
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
RELEASE="ReleaseFOUR-daily"
RELEASE="ReleaseEIGHT-daily"
REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg"
REPOSITORY="testing"
REPOSITORY_BASE="http://osm-download.etsi.org/repository/osm/debian"
......
......@@ -29,7 +29,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install wget pyt
RUN python3 -m pip install -U pip && python3 -m pip install pyyaml python-magic pyangbind pytest==4.6.3 verboselogs
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseSEVEN-daily
ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
......
......@@ -24,7 +24,7 @@ RUN python3 -m pip install haikunator requests robotframework robotframework-sel
git+https://osm.etsi.org/gerrit/osm/IM.git git+https://osm.etsi.org/gerrit/osm/osmclient.git
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseSEVEN-daily
ARG RELEASE=ReleaseEIGHT-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
ARG TESTS_VERSION
......@@ -60,4 +60,4 @@ ENV K8S_CREDENTIALS=/root/.kube/config
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
ENTRYPOINT [ "/robot-systest/run_test.sh"]
\ No newline at end of file
ENTRYPOINT [ "/robot-systest/run_test.sh"]
......@@ -43,7 +43,8 @@ The "layers" folder include one common layer for all the osm charms (osm-common)
├── nbi-k8s
├── pol-k8s
├── ro-k8s
└── ui-k8s
├── ui-k8s
└── ng-ui --> new operator framework
```
......
<!--
Copyright 2020 Canonical Ltd.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
# Charmed OSM
Charmed OSM is an OSM distribution, developed and maintained by Canonical, which uses Juju charms to simplify its deployments and operations. Charmed OSM enables TSPs to easily deploy pure upstream OSM in highly available, production-grade and scalable clusters.
- Industry‐aligned and fully compliant with upstream
- Predictable release cadence and upgrade path
- Simplified deployments and operations
- Stable and secure
- Highly Available and resilient against failures
- Supported with [Ubuntu Advantage](https://ubuntu.com/advantage)
- Availability of managed services
## Quick start
Go to the [OSM User Guide](https://osm.etsi.org/docs/user-guide/03-installing-osm.html#charmed-installation)
......@@ -28,7 +28,7 @@ applications:
zookeeper-units: 3
annotations:
gui-x: 0
gui-y: 1100
gui-y: 550
mariadb-k8s:
charm: "cs:~charmed-osm/mariadb-k8s"
channel: "stable"
......@@ -46,8 +46,8 @@ applications:
query-cache-size: 0
ha-mode: true
annotations:
gui-x: -500
gui-y: -400
gui-x: -250
gui-y: -200
kafka-k8s:
charm: "cs:~charmed-osm/kafka-k8s"
channel: "stable"
......@@ -63,7 +63,7 @@ applications:
zookeeper-service-name: zookeeper-k8s-endpoints
annotations:
gui-x: 0
gui-y: 600
gui-y: 300
mongodb-k8s:
charm: "cs:~charmed-osm/mongodb-k8s"
channel: "stable"
......@@ -80,7 +80,7 @@ applications:
enable-sidecar: true
annotations:
gui-x: 0
gui-y: 100
gui-y: 50
nbi-k8s:
charm: "cs:~charmed-osm/nbi-k8s"
channel: "%(channel)s"
......@@ -93,7 +93,7 @@ applications:
DATABASE_COMMONKEY: osm
annotations:
gui-x: 0
gui-y: -400
gui-y: -200
ro-k8s:
charm: "cs:~charmed-osm/ro-k8s"
channel: "%(channel)s"
......@@ -106,8 +106,8 @@ applications:
ro_database: "mano_db"
OPENMANO_TENANT: "osm"
annotations:
gui-x: -500
gui-y: 600
gui-x: -250
gui-y: 300
ui-k8s:
charm: "cs:~charmed-osm/ui-k8s"
channel: "%(channel)s"
......@@ -115,9 +115,22 @@ applications:
series: kubernetes
options:
mysql_database: lwui
annotations:
gui-x: 250
gui-y: -200
ng-ui:
charm: "%(prefix)s/ng-ui%(suffix)s"
channel: "%(channel)s"
scale: 3
series: kubernetes
options:
port: 80
https_port: 443
server_name: localhost
client_max_body_size: 15M
annotations:
gui-x: 500
gui-y: -400
gui-y: 100
lcm-k8s:
charm: "cs:~charmed-osm/lcm-k8s"
channel: "%(channel)s"
......@@ -132,12 +145,11 @@ applications:
vca_password: secret
vca_pubkey: pubkey
vca_cacert: cacert
vca_apiproxy: apiproxy
use_external_vca: true
DATABASE_COMMONKEY: osm
annotations:
gui-x: -500
gui-y: 100
gui-x: -250
gui-y: 50
mon-k8s:
charm: "cs:~charmed-osm/mon-k8s"
channel: "%(channel)s"
......@@ -158,8 +170,8 @@ applications:
vca_cacert: cacert
use_external_vca: true
annotations:
gui-x: 500
gui-y: 100
gui-x: 250
gui-y: 50
pol-k8s:
charm: "cs:~charmed-osm/pol-k8s"
channel: "%(channel)s"
......@@ -170,8 +182,16 @@ applications:
options:
log_level: INFO
annotations:
gui-x: -500
gui-y: 1100
gui-x: -250
gui-y: 550
pla:
charm: "%(prefix)s/pla%(suffix)s"
channel: "%(channel)s"
scale: 3
series: kubernetes
annotations:
gui-x: 500
gui-y: -200
prometheus-k8s:
charm: "cs:~charmed-osm/prometheus-k8s"
channel: "stable"
......@@ -184,16 +204,16 @@ applications:
web-subpath: /
default-target: "mon-k8s:8000"
annotations:
gui-x: 500
gui-y: 600
gui-x: 250
gui-y: 300
grafana-k8s:
charm: "cs:~charmed-osm/grafana-k8s"
channel: "stable"
scale: 3
series: kubernetes
annotations:
gui-x: 500
gui-y: 1100
gui-x: 250
gui-y: 550
relations:
- - "kafka-k8s:zookeeper"
......@@ -228,3 +248,9 @@ relations:
- "nbi-k8s:nbi"
- - "prometheus-k8s:prometheus"
- "nbi-k8s:prometheus"
- - "pla:kafka"
- "kafka-k8s:kafka"
- - "pla:mongo"
- "mongodb-k8s:mongo"
- - 'ng-ui:nbi'
- 'nbi-k8s:nbi'
<!--
Copyright 2020 Canonical Ltd.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
# Charmed OSM
Charmed OSM is an OSM distribution, developed and maintained by Canonical, which uses Juju charms to simplify its deployments and operations. Charmed OSM enables TSPs to easily deploy pure upstream OSM in highly available, production-grade and scalable clusters.
- Industry‐aligned and fully compliant with upstream
- Predictable release cadence and upgrade path
- Simplified deployments and operations
- Stable and secure
- Highly Available and resilient against failures
- Supported with [Ubuntu Advantage](https://ubuntu.com/advantage)
- Availability of managed services
## Quick start
Go to the [OSM User Guide](https://osm.etsi.org/docs/user-guide/03-installing-osm.html#charmed-installation)
......@@ -15,8 +15,8 @@ description: Single instance OSM bundle
bundle: kubernetes
applications:
zookeeper-k8s:
charm: 'cs:~charmed-osm/zookeeper-k8s'
channel: 'stable'
charm: "cs:~charmed-osm/zookeeper-k8s"
channel: "stable"
scale: 1
series: kubernetes
storage:
......@@ -28,10 +28,10 @@ applications:
zookeeper-units: 1
annotations:
gui-x: 0
gui-y: 1100
gui-y: 550
mariadb-k8s:
charm: 'cs:~charmed-osm/mariadb-k8s'
channel: 'stable'
charm: "cs:~charmed-osm/mariadb-k8s"
channel: "stable"
scale: 1
series: kubernetes
storage:
......@@ -46,11 +46,11 @@ applications:
query-cache-size: 0
ha-mode: false
annotations:
gui-x: -500
gui-y: -400
gui-x: -250
gui-y: -200
kafka-k8s:
charm: 'cs:~charmed-osm/kafka-k8s'
channel: 'stable'
charm: "cs:~charmed-osm/kafka-k8s"
channel: "stable"
scale: 1
series: kubernetes
storage:
......@@ -63,10 +63,10 @@ applications:
zookeeper-service-name: zookeeper-k8s-endpoints
annotations:
gui-x: 0
gui-y: 600
gui-y: 300
mongodb-k8s:
charm: 'cs:~charmed-osm/mongodb-k8s'
channel: 'stable'
charm: "cs:~charmed-osm/mongodb-k8s"
channel: "stable"
scale: 1
series: kubernetes
storage:
......@@ -80,10 +80,10 @@ applications:
enable-sidecar: false
annotations:
gui-x: 0
gui-y: 100
gui-y: 50
nbi-k8s:
charm: '%(prefix)s/nbi-k8s%(suffix)s'
channel: '%(channel)s'
charm: "%(prefix)s/nbi-k8s%(suffix)s"
channel: "%(channel)s"
scale: 1
series: kubernetes
storage:
......@@ -93,34 +93,47 @@ applications:
DATABASE_COMMONKEY: osm
annotations:
gui-x: 0
gui-y: -400
gui-y: -200
ro-k8s:
charm: '%(prefix)s/ro-k8s%(suffix)s'
channel: '%(channel)s'
charm: "%(prefix)s/ro-k8s%(suffix)s"
channel: "%(channel)s"
scale: 1
series: kubernetes
storage:
log: 50M
options:
vim_database: 'mano_vim_db'
ro_database: 'mano_db'
OPENMANO_TENANT: 'osm'
vim_database: "mano_vim_db"
ro_database: "mano_db"
OPENMANO_TENANT: "osm"
annotations:
gui-x: -500
gui-y: 600
gui-x: -250
gui-y: 300
ui-k8s:
charm: '%(prefix)s/ui-k8s%(suffix)s'
channel: '%(channel)s'
charm: "%(prefix)s/ui-k8s%(suffix)s"
channel: "%(channel)s"
scale: 1
series: kubernetes
options:
mysql_database: lwui
annotations:
gui-x: 250
gui-y: -200
ng-ui:
charm: "%(prefix)s/ng-ui%(suffix)s"
channel: "%(channel)s"
scale: 1
series: kubernetes
options:
port: 80
https_port: 443
server_name: localhost
client_max_body_size: 15M
annotations:
gui-x: 500
gui-y: -400
gui-y: 100
lcm-k8s:
charm: '%(prefix)s/lcm-k8s%(suffix)s'
channel: '%(channel)s'
charm: "%(prefix)s/lcm-k8s%(suffix)s"
channel: "%(channel)s"
scale: 1
series: kubernetes
storage:
......@@ -132,15 +145,14 @@ applications:
vca_password: secret
vca_pubkey: pubkey
vca_cacert: cacert
vca_apiproxy: apiproxy
use_external_vca: false
DATABASE_COMMONKEY: osm
annotations:
gui-x: -500
gui-y: 100
gui-x: -250
gui-y: 50
mon-k8s:
charm: '%(prefix)s/mon-k8s%(suffix)s'
channel: '%(channel)s'
charm: "%(prefix)s/mon-k8s%(suffix)s"
channel: "%(channel)s"
scale: 1
series: kubernetes
storage:
......@@ -158,11 +170,11 @@ applications:
vca_cacert: cacert
use_external_vca: false
annotations:
gui-x: 500
gui-y: 100
gui-x: 250
gui-y: 50
pol-k8s:
charm: '%(prefix)s/pol-k8s%(suffix)s'
channel: '%(channel)s'
charm: "%(prefix)s/pol-k8s%(suffix)s"
channel: "%(channel)s"
scale: 1
series: kubernetes
storage:
......@@ -170,11 +182,19 @@ applications:
options:
log_level: INFO
annotations:
gui-x: -500
gui-y: 1100
gui-x: -250
gui-y: 550
pla:
charm: "%(prefix)s/pla%(suffix)s"
channel: "%(channel)s"
scale: 1
series: kubernetes
annotations:
gui-x: 500
gui-y: -200
prometheus-k8s:
charm: 'cs:~charmed-osm/prometheus-k8s'
channel: 'stable'
charm: "cs:~charmed-osm/prometheus-k8s"
channel: "stable"
scale: 1
series: kubernetes
storage:
......@@ -184,47 +204,53 @@ applications:
web-subpath: /
default-target: "mon-k8s:8000"
annotations:
gui-x: 500
gui-y: 600
gui-x: 250
gui-y: 300
grafana-k8s:
charm: 'cs:~charmed-osm/grafana-k8s'
channel: 'stable'
charm: "cs:~charmed-osm/grafana-k8s"
channel: "stable"
scale: 1
series: kubernetes
annotations:
gui-x: 500
gui-y: 1100
gui-x: 250
gui-y: 550
relations:
- - 'kafka-k8s:zookeeper'
- 'zookeeper-k8s:zookeeper'
- - 'ro-k8s:mysql'
- 'mariadb-k8s:mysql'
- - 'nbi-k8s:mongo'
- 'mongodb-k8s:mongo'
- - 'nbi-k8s:kafka'
- 'kafka-k8s:kafka'
- - 'lcm-k8s:kafka'
- 'kafka-k8s:kafka'
- - 'lcm-k8s:mongo'
- 'mongodb-k8s:mongo'
- - 'mon-k8s:kafka'
- 'kafka-k8s:kafka'
- - 'mon-k8s:mongo'
- 'mongodb-k8s:mongo'
- - 'pol-k8s:kafka'
- 'kafka-k8s:kafka'
- - 'pol-k8s:mongo'
- 'mongodb-k8s:mongo'
- - 'lcm-k8s:ro'
- 'ro-k8s:ro'
- - 'prometheus-k8s:prometheus'
- 'mon-k8s:prometheus'
- - 'grafana-k8s:prometheus'
- 'prometheus-k8s:prometheus'
- - 'ui-k8s:mysql'
- 'mariadb-k8s:mysql'
- - 'ui-k8s:nbi'
- - "kafka-k8s:zookeeper"
- "zookeeper-k8s:zookeeper"
- - "ro-k8s:mysql"
- "mariadb-k8s:mysql"
- - "nbi-k8s:mongo"
- "mongodb-k8s:mongo"
- - "nbi-k8s:kafka"
- "kafka-k8s:kafka"
- - "lcm-k8s:kafka"
- "kafka-k8s:kafka"
- - "lcm-k8s:mongo"
- "mongodb-k8s:mongo"
- - "mon-k8s:kafka"
- "kafka-k8s:kafka"
- - "mon-k8s:mongo"
- "mongodb-k8s:mongo"
- - "pol-k8s:kafka"
- "kafka-k8s:kafka"
- - "pol-k8s:mongo"
- "mongodb-k8s:mongo"
- - "lcm-k8s:ro"
- "ro-k8s:ro"
- - "prometheus-k8s:prometheus"
- "mon-k8s:prometheus"
- - "grafana-k8s:prometheus"
- "prometheus-k8s:prometheus"
- - "ui-k8s:mysql"
- "mariadb-k8s:mysql"
- - "ui-k8s:nbi"
- "nbi-k8s:nbi"
- - "prometheus-k8s:prometheus"
- "nbi-k8s:prometheus"
- - "pla:kafka"
- "kafka-k8s:kafka"
- - "pla:mongo"
- "mongodb-k8s:mongo"
- - 'ng-ui:nbi'
- 'nbi-k8s:nbi'
- - 'prometheus-k8s:prometheus'
- 'nbi-k8s:prometheus'
......@@ -44,6 +44,10 @@ options:
type: string
description: "The VCA lxd cloud name"
default: "localhost"
vca_k8s_cloud:
type: string
description: "The VCA K8s cloud name"
default: "k8scloud"
advertised-hostname:
description: LCM Hostname
type: string
......
......@@ -21,7 +21,7 @@ from charmhelpers.core.hookenv import (
config,
)
from charms import layer
import yaml
@hook("upgrade-charm")
@when("leadership.is_leader")
......@@ -131,4 +131,7 @@ def make_pod_spec(ro_host, ro_port, kafka_host, kafka_port, mongo_uri):
}
data.update(cfg)
return pod_spec_template % data
spec = yaml.safe_dump(pod_spec_template % data)
if "vca_apiproxy" in cfg and cfg["vca_apiproxy"] != "":
spec["containers"][0]["config"]["OSMLCM_VCA_APIPROXY"] = cfg["vca_apiproxy"]
return spec
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment