diff --git a/installers/charm/bundles/osm-ha/README.md b/installers/charm/bundles/osm-ha/README.md new file mode 100644 index 0000000000000000000000000000000000000000..84dbde49d0fdd16bbfcfbdb697e0c4157cd4e5f7 --- /dev/null +++ b/installers/charm/bundles/osm-ha/README.md @@ -0,0 +1,32 @@ + +# 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) diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml index 9976679de7e6f56a4068806ac8e814fe18daf20b..ea3d7a14b22fd8000eef6e4a525978813061429d 100644 --- a/installers/charm/bundles/osm-ha/bundle.yaml +++ b/installers/charm/bundles/osm-ha/bundle.yaml @@ -121,7 +121,7 @@ applications: ng-ui: charm: "%(prefix)s/ng-ui%(suffix)s" channel: "%(channel)s" - scale: 1 + scale: 3 series: kubernetes options: port: 80 @@ -184,7 +184,7 @@ applications: annotations: gui-x: -250 gui-y: 550 - pla-k8s: + pla: charm: "%(prefix)s/pla%(suffix)s" channel: "%(channel)s" scale: 3 @@ -252,7 +252,5 @@ relations: - "kafka-k8s:kafka" - - "pla:mongo" - "mongodb-k8s:mongo" - - - "pla:mysql" - - "mariadb-k8s:mysql" - - 'ng-ui:nbi' - 'nbi-k8s:nbi' diff --git a/installers/charm/bundles/osm/README.md b/installers/charm/bundles/osm/README.md new file mode 100644 index 0000000000000000000000000000000000000000..84dbde49d0fdd16bbfcfbdb697e0c4157cd4e5f7 --- /dev/null +++ b/installers/charm/bundles/osm/README.md @@ -0,0 +1,32 @@ + +# 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) diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml index 6207fd88c5d08d8ed7247016a6dc7fb17267573c..c4567aca5a05687327aafaa927916fe947279c77 100644 --- a/installers/charm/bundles/osm/bundle.yaml +++ b/installers/charm/bundles/osm/bundle.yaml @@ -252,7 +252,5 @@ relations: - "kafka-k8s:kafka" - - "pla:mongo" - "mongodb-k8s:mongo" - - - "pla:mysql" - - "mariadb-k8s:mysql" - - 'ng-ui:nbi' - 'nbi-k8s:nbi' diff --git a/installers/charm/pla/metadata.yaml b/installers/charm/pla/metadata.yaml index afd45748962f7b991eb9045cf4239478e5e35502..90c9d400c64c49102b10acc42b4989d18628422e 100644 --- a/installers/charm/pla/metadata.yaml +++ b/installers/charm/pla/metadata.yaml @@ -27,5 +27,3 @@ requires: interface: kafka mongo: interface: mongodb - mysql: - interface: mysql \ No newline at end of file diff --git a/installers/charm/pla/src/charm.py b/installers/charm/pla/src/charm.py index f90b407a0a90d5a7ad7d9c2079595783daacfbc4..2e199b36652d9eb0017003e1cab59cf4ac068bf5 100755 --- a/installers/charm/pla/src/charm.py +++ b/installers/charm/pla/src/charm.py @@ -43,8 +43,6 @@ class PLACharm(CharmBase): self.state.set_default(kafka_host=None) self.state.set_default(kafka_port=None) self.state.set_default(mongodb_uri=None) - self.state.set_default(mysql_host=None) - self.state.set_default(mysql_port=None) # Observe Charm related events self.framework.observe(self.on.config_changed, self.on_config_changed) @@ -58,9 +56,6 @@ class PLACharm(CharmBase): self.framework.observe( self.on.mongo_relation_changed, self.on_mongo_relation_changed ) - self.framework.observe( - self.on.mysql_relation_changed, self.on_mysql_relation_changed - ) def _apply_spec(self): # Only apply the spec if this unit is a leader. @@ -74,9 +69,6 @@ class PLACharm(CharmBase): if not self.state.mongodb_uri: unit.status = WaitingStatus("Waiting for MongoDB") return - if not self.state.mysql_host or not self.state.mysql_port: - unit.status = WaitingStatus("Waiting for MySQL") - return unit.status = MaintenanceStatus("Applying new pod spec") @@ -91,12 +83,6 @@ class PLACharm(CharmBase): def make_pod_spec(self): config = self.framework.model.config - mysql_uri = "mysql://root:{}@{}:{}/{}".format( - self.state.mysql_root_password, - self.state.mysql_host, - self.state.mysql_port, - self.state.mysql_database, - ) ports = [ {"name": "port", "containerPort": config["port"], "protocol": "TCP",}, ] @@ -108,7 +94,6 @@ class PLACharm(CharmBase): "OSMPLA_DATABASE_DRIVER": "mongo", "OSMPLA_DATABASE_URI": self.state.mongodb_uri, "OSMPLA_GLOBAL_LOG_LEVEL": config["log_level"], - "OSMPLA_SQL_DATABASE_URI": mysql_uri, "OSMPLA_DATABASE_COMMONKEY": config["database_common_key"], } @@ -157,17 +142,6 @@ class PLACharm(CharmBase): ) self._apply_spec() - def on_mysql_relation_changed(self, event): - unit = self.model.unit - if not unit.is_leader(): - return - unit_data = event.relation.data[event.unit] - self.state.mysql_host = unit_data.get("host") - self.state.mysql_port = unit_data.get("port") - self.state.mysql_root_password = unit_data.get("root_password") - self.state.mysql_database = self.model.config["database"] - self._apply_spec() - if __name__ == "__main__": main(PLACharm)