Merge "Sync charm-helpers for Ussuri/Focal release and version details"

charmhelpers/contrib/openstack/amulet/deployment.py

@@ -295,9 +295,11 @@ class OpenStackAmuletDeployment(AmuletDeployment):
             ('bionic', 'cloud:bionic-rocky'): self.bionic_rocky,
             ('bionic', 'cloud:bionic-stein'): self.bionic_stein,
             ('bionic', 'cloud:bionic-train'): self.bionic_train,
+            ('bionic', 'cloud:bionic-ussuri'): self.bionic_ussuri,
             ('cosmic', None): self.cosmic_rocky,
             ('disco', None): self.disco_stein,
             ('eoan', None): self.eoan_train,
+            ('focal', None): self.focal_ussuri,
         }
         return releases[(self.series, self.openstack)]
 
@@ -316,6 +318,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
             ('cosmic', 'rocky'),
             ('disco', 'stein'),
             ('eoan', 'train'),
+            ('focal', 'ussuri'),
         ])
         if self.openstack:
             os_origin = self.openstack.split(':')[1]

charmhelpers/contrib/openstack/amulet/utils.py

@@ -62,6 +62,7 @@ OPENSTACK_RELEASES_PAIRS = [
     'bionic_rocky', 'cosmic_rocky',
     'bionic_stein', 'disco_stein',
     'bionic_train', 'eoan_train',
+    'bionic_ussuri', 'focal_ussuri',
 ]
 
 

charmhelpers/contrib/openstack/utils.py

@@ -131,6 +131,7 @@ OPENSTACK_RELEASES = (
     'rocky',
     'stein',
     'train',
+    'ussuri',
 )
 
 UBUNTU_OPENSTACK_RELEASE = OrderedDict([
@@ -151,6 +152,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
     ('cosmic', 'rocky'),
     ('disco', 'stein'),
     ('eoan', 'train'),
+    ('focal', 'ussuri'),
 ])
 
 
@@ -172,6 +174,7 @@ OPENSTACK_CODENAMES = OrderedDict([
     ('2018.2', 'rocky'),
     ('2019.1', 'stein'),
     ('2019.2', 'train'),
+    ('2020.1', 'ussuri'),
 ])
 
 # The ugly duckling - must list releases oldest to newest
@@ -210,6 +213,8 @@ SWIFT_CODENAMES = OrderedDict([
         ['2.20.0', '2.21.0']),
     ('train',
         ['2.22.0', '2.23.0']),
+    ('ussuri',
+        ['2.24.0']),
 ])
 
 # >= Liberty version->codename mapping
@@ -224,6 +229,7 @@ PACKAGE_CODENAMES = {
         ('18', 'rocky'),
         ('19', 'stein'),
         ('20', 'train'),
+        ('21', 'ussuri'),
     ]),
     'neutron-common': OrderedDict([
         ('7', 'liberty'),
@@ -235,6 +241,7 @@ PACKAGE_CODENAMES = {
         ('13', 'rocky'),
         ('14', 'stein'),
         ('15', 'train'),
+        ('16', 'ussuri'),
     ]),
     'cinder-common': OrderedDict([
         ('7', 'liberty'),
@@ -246,6 +253,7 @@ PACKAGE_CODENAMES = {
         ('13', 'rocky'),
         ('14', 'stein'),
         ('15', 'train'),
+        ('16', 'ussuri'),
     ]),
     'keystone': OrderedDict([
         ('8', 'liberty'),
@@ -257,6 +265,7 @@ PACKAGE_CODENAMES = {
         ('14', 'rocky'),
         ('15', 'stein'),
         ('16', 'train'),
+        ('17', 'ussuri'),
     ]),
     'horizon-common': OrderedDict([
         ('8', 'liberty'),
@@ -268,6 +277,7 @@ PACKAGE_CODENAMES = {
         ('14', 'rocky'),
         ('15', 'stein'),
         ('16', 'train'),
+        ('17', 'ussuri'),
     ]),
     'ceilometer-common': OrderedDict([
         ('5', 'liberty'),
@@ -279,6 +289,7 @@ PACKAGE_CODENAMES = {
         ('11', 'rocky'),
         ('12', 'stein'),
         ('13', 'train'),
+        ('14', 'ussuri'),
     ]),
     'heat-common': OrderedDict([
         ('5', 'liberty'),
@@ -290,6 +301,7 @@ PACKAGE_CODENAMES = {
         ('11', 'rocky'),
         ('12', 'stein'),
         ('13', 'train'),
+        ('14', 'ussuri'),
     ]),
     'glance-common': OrderedDict([
         ('11', 'liberty'),
@@ -301,6 +313,7 @@ PACKAGE_CODENAMES = {
         ('17', 'rocky'),
         ('18', 'stein'),
         ('19', 'train'),
+        ('20', 'ussuri'),
     ]),
     'openstack-dashboard': OrderedDict([
         ('8', 'liberty'),
@@ -312,6 +325,7 @@ PACKAGE_CODENAMES = {
         ('14', 'rocky'),
         ('15', 'stein'),
         ('16', 'train'),
+        ('17', 'ussuri'),
     ]),
 }
 

charmhelpers/fetch/ubuntu.py

@@ -182,6 +182,14 @@ CLOUD_ARCHIVE_POCKETS = {
     'train/proposed': 'bionic-proposed/train',
     'bionic-train/proposed': 'bionic-proposed/train',
     'bionic-proposed/train': 'bionic-proposed/train',
+    # Ussuri
+    'ussuri': 'bionic-updates/ussuri',
+    'bionic-ussuri': 'bionic-updates/ussuri',
+    'bionic-ussuri/updates': 'bionic-updates/ussuri',
+    'bionic-updates/ussuri': 'bionic-updates/ussuri',
+    'ussuri/proposed': 'bionic-proposed/ussuri',
+    'bionic-ussuri/proposed': 'bionic-proposed/ussuri',
+    'bionic-proposed/ussuri': 'bionic-proposed/ussuri',
 }
 
 

tests/bundles/disco-stein.yaml

@@ -1,35 +0,0 @@
-series: disco
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-
-relations:
-  - - keystone:shared-db
-    - mysql:shared-db
-  - - glance:shared-db
-    - mysql:shared-db
-  - - glance:identity-service
-    - keystone:identity-service
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    to:
-      - '1'
-  glance:
-    charm: ../../../glance
-    num_units: 1
-    to:
-      - '2'

tests/tests.yaml

@@ -18,7 +18,6 @@ gate_bundles:
   - bionic-rocky
   - bionic-stein
   - bionic-train
-  - disco-stein
 dev_bundles:
   - bionic-train