Merge lp:~roadmr/canonical-identity-provider/charm-xenial-minideploy into lp:~ubuntuone-pqm-team/canonical-identity-provider/charm

[Daniel Manrique]

Modernize charm's mini-mojo deployment makefile so it works with the Xenial-enabled charm.

The only change to the actual charm is declaring the supported series; all the other changes are to the development-only tooling and should not affect actual deploys using the charm.

[Guillermo Gonzalez (verterok)]

Looks good!

review: Approve

=== modified file 'Makefile'
--- Makefile	2016-11-30 13:52:59 +0000
+++ Makefile	2019-08-15 21:51:25 +0000
@@ -25,9 +25,9 @@
 
 setup-environment:
 	./scripts/create-dev-db
-	juju set sso-app db_host=$$(juju status sso-postgresql/0 | grep public-address | head -1 | awk '{print $$2}')
+	juju config sso-app db_host=$$(juju status --format=yaml sso-postgresql/0 | grep public-address | head -1 | awk '{print $$2}')
 
 deploy-build-label: 
-	juju run --service sso-app "actions/preload build_label=$(BUILD_LABEL) force=true"
+	juju run --application sso-app "actions/preload build_label=$(BUILD_LABEL) force=true"
 	juju run --unit sso-app/0 "actions/migrate build_label=$(BUILD_LABEL) db_user=ssoadmin db_password=ssoadmin"
-	juju set sso-app build_label=$(BUILD_LABEL)
+	juju config sso-app build_label=$(BUILD_LABEL)

=== modified file 'charm.mk'
--- charm.mk	2018-05-24 19:13:37 +0000
+++ charm.mk	2019-08-15 21:51:25 +0000
@@ -42,7 +42,8 @@
 DEPLOYER_TARGET ?= 
 
 CHARM ?= $(shell grep name: metadata.yaml | awk '{print $$2}')
-CHARM_SERIES ?= trusty
+CHARM_SERIES ?= xenial
+COLLECT_FILE ?= $(PWD)/collect
 
 # workarond for lack of multiline vars
 define NEWLINE
@@ -155,11 +156,13 @@
 $(CACHE_DIR):
 	@echo Building charm workspace cache in $(CACHE_DIR)...
 	@mkdir -p $(CACHE_DIR) $(TARBALLS) $(CUSTOM_TARBALLS)
+
+$(LOCAL_TRUNK):
 	@bzr branch $(TRUNK) $(LOCAL_TRUNK)
 
 # | means only will fire if dir doesn't exist, not if anything inside dir has changed
 # http://www.gnu.org/software/make/manual/make.html#Prerequisite-Types
-_pull-trunk: |$(CACHE_DIR)
+_pull-trunk: $(LOCAL_TRUNK)|$(CACHE_DIR)
 	@echo Updating local copy for $(TRUNK)
 	@bzr pull -d $(LOCAL_TRUNK)
 
@@ -191,8 +194,11 @@
 	@rm -f $(JUJU_REPOSITORY)/$(CHARM_SERIES)/$(CHARM)
 	@ln -sf $(PWD) $(JUJU_REPOSITORY)/$(CHARM_SERIES)/$(CHARM)
 
+collect:
+	test -s collect && cd $(JUJU_REPOSITORY)/$(CHARM_SERIES) && codetree $(COLLECT_FILE) || exit 0
+
 # deploy the env from scratch
-deploy: payload | $(JUJU_REPOSITORY) exec.d/basenode
+deploy: payload $(JUJU_REPOSITORY) exec.d/basenode collect
 	juju-deployer -d --local-mods -c $(DEPLOYER_CONFIG) $(DEPLOYER_TARGET)
 	$(MAKE) setup-environment  # HOOK into your Makefile
 	$(MAKE) rollout SKIP_BUILD=true
@@ -214,3 +220,5 @@
 # TODO replace this with an action on the nrpe charm
 nagios:
 	juju run --service $(SERVICE) "grep -E -oh '/(usr|srv).*' /etc/nagios/nrpe.d/check_* | grep -v etc_bzr | sudo -u nagios -s bash"
+
+.PHONY: collect

=== modified file 'deploy.yaml'
--- deploy.yaml	2016-02-19 11:32:08 +0000
+++ deploy.yaml	2019-08-15 21:51:25 +0000
@@ -1,8 +1,8 @@
 sso-dev-minimal:
-  series: trusty
+  series: xenial
   services:
     sso-app:
-      charm: local:trusty/canonical-identity-provider
+      charm: local:xenial/canonical-identity-provider
       options:
         deployment: devel
         oops_reporter: AS-DEVEL.SSO
@@ -14,11 +14,11 @@
         twofactor_mandatory_teams: "['ubuntuone-hackers']"
         email_whitelist_regexp_list: "['testemail(\\+[^@]*)?@example\\.com']"
     sso-postgresql:
-      charm: local:trusty/postgresql
-      branch: lp:~charmers/charms/trusty/postgresql/trunk
+      charm: local:xenial/postgresql
+      series: xenial
       to: [sso-app]
       options:
-        version: "9.3"
+        version: "9.5"  # Production uses 9.3 but 9.5 is ok for local deploys
         # should cover lxc and openstack deploys
         admin_addresses: 10.0.0.0/8,127.0.0.1
         # dev settings, to make as fast as possible
@@ -26,16 +26,15 @@
         # borked in r143 of postgres charm
         # synchronous_commit: false
         standard_conforming_strings: false
-        extra_packages: postgresql-plpython-9.3
+        extra_packages: postgresql-plpython-9.5
         full_page_writes: false
         ssl: "False"
         # disable backups
         backup_schedule: "0 0 1 1 *"
     sso-memcached:
-      charm: local:trusty/memcached
-      branch: lp:~canonical-losas/canonical-is-charms/memcached
+      charm: local:xenial/memcached 
     sso-wsgi:
-      charm: cs:~bloodearnest/trusty/gunicorn
+      charm: local:xenial/gunicorn
       options:
         wsgi_workers: 2
   relations:
@@ -51,10 +50,9 @@
     - sso-dev-minimal
   services:
     sso-nrpe:
-      charm: local:trusty/nrpe-external-master
-      branch: lp:~canonical-sysadmins/canonical-is-charms/nrpe-external-master
+      charm: local:xenial/nrpe
     sso-conn-check:
-      charm: cs:~ubuntuone-hackers/trusty/conn-check
+      charm: local:xenial/conn-check
   relations:
     sso-nrpe:nrpe-external-master:
       consumes:

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-10-13 14:12:12 +0000
+++ metadata.yaml	2019-08-15 21:51:25 +0000
@@ -1,6 +1,8 @@
 name: canonical-identity-provider
 summary: Canonical Identity Provider is an OpenID and OAuth 1.0 authentication service, for single sign on.
 maintainer: Simon Davy <[e-mail]>
+series:
+  - xenial
 description: ""
 categories:
   - authentication