Merge lp:~thedac/openstack-mojo-specs/ha-automation into lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709

Proposed by David Ames
Status: Merged
Merged at revision: 334
Proposed branch: lp:~thedac/openstack-mojo-specs/ha-automation
Merge into: lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709
Diff against target: 676 lines (+121/-56)
16 files modified
helper/bundles/cephradosgw-ha.yaml (+1/-1)
helper/bundles/ha-next.yaml (+9/-9)
helper/bundles/ha.yaml (+9/-9)
helper/bundles/haphase1-next.yaml (+9/-9)
helper/bundles/haphase1.yaml (+9/-9)
helper/bundles/haphase2-next.yaml (+9/-9)
helper/bundles/haphase2.yaml (+9/-9)
helper/bundles/swift-ha-proxy-phase1.yaml (+1/-1)
helper/setup/preflight.py (+44/-0)
specs/full_stack/next_ha_oneshot/icehouse/manifest (+3/-0)
specs/full_stack/next_ha_oneshot/kilo/manifest (+3/-0)
specs/full_stack/next_ha_oneshot/liberty/manifest (+3/-0)
specs/full_stack/next_ha_oneshot/mitaka/manifest (+3/-0)
specs/full_stack/next_ha_oneshot/newton/manifest (+3/-0)
specs/full_stack/next_ha_oneshot/ocata/manifest (+3/-0)
specs/full_stack/next_ha_oneshot/pike/manifest (+3/-0)
To merge this branch: bzr merge lp:~thedac/openstack-mojo-specs/ha-automation
Reviewer Review Type Date Requested Status
Ryan Beisner Approve
Review via email: mp+330464@code.launchpad.net

Description of the change

HA in OSCI

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Awesome!

review: Approve
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Bah. Awesome except the `make lint` failures. I believe the {{ foo }} needs to be in quotes.

Traceback (most recent call last):
  File "./helper/scripts/mojo-spec-check.py", line 257, in <module>
    sys.exit(main(sys.argv))
  File "./helper/scripts/mojo-spec-check.py", line 251, in main
    check_yaml_syntax(dir_list)
  File "./helper/scripts/mojo-spec-check.py", line 213, in check_yaml_syntax
    yaml.load(stream)
  File "/home/rbeisner/.local/lib/python2.7/site-packages/yaml/__init__.py", line 71, in load
    return loader.get_single_data()
  File "/home/rbeisner/.local/lib/python2.7/site-packages/yaml/constructor.py", line 39, in get_single_data
    return self.construct_document(node)
  File "/home/rbeisner/.local/lib/python2.7/site-packages/yaml/constructor.py", line 48, in construct_document
    for dummy in generator:
  File "/home/rbeisner/.local/lib/python2.7/site-packages/yaml/constructor.py", line 398, in construct_yaml_map
    value = self.construct_mapping(node)
  File "/home/rbeisner/.local/lib/python2.7/site-packages/yaml/constructor.py", line 208, in construct_mapping
    return BaseConstructor.construct_mapping(self, node, deep=deep)
  File "/home/rbeisner/.local/lib/python2.7/site-packages/yaml/constructor.py", line 132, in construct_mapping
    "found unacceptable key (%s)" % exc, key_node.start_mark)
yaml.constructor.ConstructorError: while constructing a mapping
  in "haphase2.yaml", line 29, column 14
found unacceptable key (unhashable type: 'dict')
  in "haphase2.yaml", line 29, column 15

review: Needs Fixing
335. By David Ames

Quote template variables

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Thanks, merging!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'helper/bundles/cephradosgw-ha.yaml'
--- helper/bundles/cephradosgw-ha.yaml 2017-02-22 16:33:11 +0000
+++ helper/bundles/cephradosgw-ha.yaml 2017-09-11 15:47:43 +0000
@@ -27,7 +27,7 @@
27 charm: ceph-radosgw27 charm: ceph-radosgw
28 num_units: 328 num_units: 3
29 options:29 options:
30 vip: 10.5.100.1030 vip: "{{ MOJO_OS_VIP01 }}"
31 cephrgw-hacluster:31 cephrgw-hacluster:
32 charm: hacluster32 charm: hacluster
33 relations:33 relations:
3434
=== modified file 'helper/bundles/ha-next.yaml'
--- helper/bundles/ha-next.yaml 2017-09-05 21:37:34 +0000
+++ helper/bundles/ha-next.yaml 2017-09-11 15:47:43 +0000
@@ -9,7 +9,7 @@
9 innodb-buffer-pool-size: 200M9 innodb-buffer-pool-size: 200M
10 sst-password: changeme10 sst-password: changeme
11 root-password: changeme11 root-password: changeme
12 vip: 10.5.100.112 vip: "{{ MOJO_OS_VIP01 }}"
13 mysql-hacluster:13 mysql-hacluster:
14 charm: hacluster14 charm: hacluster
15 options:15 options:
@@ -37,7 +37,7 @@
37 options:37 options:
38 admin-password: openstack38 admin-password: openstack
39 admin-token: ubuntutesting39 admin-token: ubuntutesting
40 vip: 10.5.100.240 vip: "{{ MOJO_OS_VIP02 }}"
41 keystone-hacluster:41 keystone-hacluster:
42 charm: hacluster42 charm: hacluster
43 options:43 options:
@@ -48,7 +48,7 @@
48 constraints: mem=1G48 constraints: mem=1G
49 num_units: 349 num_units: 3
50 options:50 options:
51 vip: 10.5.100.351 vip: "{{ MOJO_OS_VIP03 }}"
52 dashboard-hacluster:52 dashboard-hacluster:
53 charm: hacluster53 charm: hacluster
54 options:54 options:
@@ -67,7 +67,7 @@
67 num_units: 367 num_units: 3
68 options:68 options:
69 network-manager: Neutron69 network-manager: Neutron
70 vip: 10.5.100.470 vip: "{{ MOJO_OS_VIP04 }}"
71 nova-cc-hacluster:71 nova-cc-hacluster:
72 charm: hacluster72 charm: hacluster
73 options:73 options:
@@ -86,7 +86,7 @@
86 options:86 options:
87 block-device: "None"87 block-device: "None"
88 glance-api-version: 288 glance-api-version: 2
89 vip: 10.5.100.589 vip: "{{ MOJO_OS_VIP05 }}"
90 cinder-hacluster:90 cinder-hacluster:
91 charm: hacluster91 charm: hacluster
92 options:92 options:
@@ -99,7 +99,7 @@
99 constraints: mem=1G99 constraints: mem=1G
100 num_units: 3100 num_units: 3
101 options:101 options:
102 vip: 10.5.100.9102 vip: "{{ MOJO_OS_VIP06 }}"
103 glance-hacluster:103 glance-hacluster:
104 charm: hacluster104 charm: hacluster
105 options:105 options:
@@ -113,7 +113,7 @@
113 zone-assignment: manual113 zone-assignment: manual
114 replicas: 3114 replicas: 3
115 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae115 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
116 vip: 10.5.100.6116 vip: "{{ MOJO_OS_VIP07 }}"
117 swift-hacluster:117 swift-hacluster:
118 charm: hacluster118 charm: hacluster
119 options:119 options:
@@ -145,7 +145,7 @@
145 constraints: mem=1G145 constraints: mem=1G
146 num_units: 3146 num_units: 3
147 options:147 options:
148 vip: 10.5.100.7148 vip: "{{ MOJO_OS_VIP08 }}"
149 ceilometer-hacluster:149 ceilometer-hacluster:
150 charm: hacluster150 charm: hacluster
151 options:151 options:
@@ -164,7 +164,7 @@
164 num_units: 3164 num_units: 3
165 options:165 options:
166 neutron-security-groups: True166 neutron-security-groups: True
167 vip: 10.5.100.8167 vip: "{{ MOJO_OS_VIP09 }}"
168 flat-network-providers: physnet1168 flat-network-providers: physnet1
169 neutron-hacluster:169 neutron-hacluster:
170 charm: hacluster170 charm: hacluster
171171
=== modified file 'helper/bundles/ha.yaml'
--- helper/bundles/ha.yaml 2017-09-06 21:02:15 +0000
+++ helper/bundles/ha.yaml 2017-09-11 15:47:43 +0000
@@ -12,7 +12,7 @@
12 innodb-buffer-pool-size: 200M12 innodb-buffer-pool-size: 200M
13 sst-password: changeme13 sst-password: changeme
14 root-password: changeme14 root-password: changeme
15 vip: 10.5.100.115 vip: "{{ MOJO_OS_VIP01 }}"
16 mysql-hacluster:16 mysql-hacluster:
17 charm: hacluster17 charm: hacluster
18 options:18 options:
@@ -40,7 +40,7 @@
40 options:40 options:
41 admin-password: openstack41 admin-password: openstack
42 admin-token: ubuntutesting42 admin-token: ubuntutesting
43 vip: 10.5.100.243 vip: "{{ MOJO_OS_VIP02 }}"
44 keystone-hacluster:44 keystone-hacluster:
45 charm: hacluster45 charm: hacluster
46 options:46 options:
@@ -51,7 +51,7 @@
51 constraints: mem=1G51 constraints: mem=1G
52 num_units: 352 num_units: 3
53 options:53 options:
54 vip: 10.5.100.354 vip: "{{ MOJO_OS_VIP03 }}"
55 dashboard-hacluster:55 dashboard-hacluster:
56 charm: hacluster56 charm: hacluster
57 options:57 options:
@@ -70,7 +70,7 @@
70 num_units: 370 num_units: 3
71 options:71 options:
72 network-manager: Neutron72 network-manager: Neutron
73 vip: 10.5.100.473 vip: "{{ MOJO_OS_VIP04 }}"
74 nova-cc-hacluster:74 nova-cc-hacluster:
75 charm: hacluster75 charm: hacluster
76 options:76 options:
@@ -89,7 +89,7 @@
89 options:89 options:
90 block-device: "None"90 block-device: "None"
91 glance-api-version: 291 glance-api-version: 2
92 vip: 10.5.100.592 vip: "{{ MOJO_OS_VIP05 }}"
93 cinder-hacluster:93 cinder-hacluster:
94 charm: hacluster94 charm: hacluster
95 options:95 options:
@@ -102,7 +102,7 @@
102 constraints: mem=1G102 constraints: mem=1G
103 num_units: 3103 num_units: 3
104 options:104 options:
105 vip: 10.5.100.9105 vip: "{{ MOJO_OS_VIP06 }}"
106 glance-hacluster:106 glance-hacluster:
107 charm: hacluster107 charm: hacluster
108 options:108 options:
@@ -116,7 +116,7 @@
116 zone-assignment: manual116 zone-assignment: manual
117 replicas: 3117 replicas: 3
118 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae118 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
119 vip: 10.5.100.6119 vip: "{{ MOJO_OS_VIP07 }}"
120 swift-hacluster:120 swift-hacluster:
121 charm: hacluster121 charm: hacluster
122 options:122 options:
@@ -148,7 +148,7 @@
148 constraints: mem=1G148 constraints: mem=1G
149 num_units: 3149 num_units: 3
150 options:150 options:
151 vip: 10.5.100.7151 vip: "{{ MOJO_OS_VIP08 }}"
152 ceilometer-hacluster:152 ceilometer-hacluster:
153 charm: hacluster153 charm: hacluster
154 options:154 options:
@@ -167,7 +167,7 @@
167 num_units: 3167 num_units: 3
168 options:168 options:
169 neutron-security-groups: True169 neutron-security-groups: True
170 vip: 10.5.100.8170 vip: "{{ MOJO_OS_VIP09 }}"
171 flat-network-providers: physnet1171 flat-network-providers: physnet1
172 neutron-hacluster:172 neutron-hacluster:
173 charm: hacluster173 charm: hacluster
174174
=== modified file 'helper/bundles/haphase1-next.yaml'
--- helper/bundles/haphase1-next.yaml 2017-09-05 21:37:34 +0000
+++ helper/bundles/haphase1-next.yaml 2017-09-11 15:47:43 +0000
@@ -26,7 +26,7 @@
26 options:26 options:
27 admin-password: openstack27 admin-password: openstack
28 admin-token: ubuntutesting28 admin-token: ubuntutesting
29 vip: 10.5.100.129 vip: "{{ MOJO_OS_VIP01 }}"
30 keystone-hacluster:30 keystone-hacluster:
31 charm: hacluster31 charm: hacluster
32 openstack-dashboard:32 openstack-dashboard:
@@ -34,7 +34,7 @@
34 constraints: mem=1G34 constraints: mem=1G
35 num_units: 235 num_units: 2
36 options:36 options:
37 vip: 10.5.100.237 vip: "{{ MOJO_OS_VIP02 }}"
38 dashboard-hacluster:38 dashboard-hacluster:
39 charm: hacluster39 charm: hacluster
40 nova-compute:40 nova-compute:
@@ -51,7 +51,7 @@
51 num_units: 251 num_units: 2
52 options:52 options:
53 network-manager: Neutron53 network-manager: Neutron
54 vip: 10.5.100.354 vip: "{{ MOJO_OS_VIP02 }}"
55 ncc-hacluster:55 ncc-hacluster:
56 charm: hacluster56 charm: hacluster
57 neutron-gateway:57 neutron-gateway:
@@ -67,7 +67,7 @@
67 options:67 options:
68 block-device: "None"68 block-device: "None"
69 glance-api-version: 269 glance-api-version: 2
70 vip: 10.5.100.470 vip: "{{ MOJO_OS_VIP03 }}"
71 constraints": mem=1G71 constraints": mem=1G
72 cinder-hacluster:72 cinder-hacluster:
73 charm: hacluster73 charm: hacluster
@@ -78,7 +78,7 @@
78 constraints: mem=1G78 constraints: mem=1G
79 num_units: 279 num_units: 2
80 options:80 options:
81 vip: 10.5.100.581 vip: "{{ MOJO_OS_VIP04 }}"
82 glance-hacluster:82 glance-hacluster:
83 charm: hacluster83 charm: hacluster
84 swift-proxy:84 swift-proxy:
@@ -89,7 +89,7 @@
89 zone-assignment: manual89 zone-assignment: manual
90 replicas: 390 replicas: 3
91 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae91 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
92 vip: 10.5.100.692 vip: "{{ MOJO_OS_VIP05 }}"
93 swift-proxy-hacluster:93 swift-proxy-hacluster:
94 charm: hacluster94 charm: hacluster
95 swift-storage-z1:95 swift-storage-z1:
@@ -121,7 +121,7 @@
121 constraints: mem=1G121 constraints: mem=1G
122 num_units: 2122 num_units: 2
123 options:123 options:
124 vip: 10.5.100.10124 vip: "{{ MOJO_OS_VIP06 }}"
125 vip_cidr: 16125 vip_cidr: 16
126openstack-percona-database:126openstack-percona-database:
127 inherits: openstack-services127 inherits: openstack-services
@@ -131,7 +131,7 @@
131 constraints: mem=1G131 constraints: mem=1G
132 num_units: 2132 num_units: 2
133 options:133 options:
134 vip: 10.5.100.10134 vip: "{{ MOJO_OS_VIP07 }}"
135 vip_cidr: 16135 vip_cidr: 16
136 root-password: crapper136 root-password: crapper
137 sst-password: crapper137 sst-password: crapper
@@ -144,7 +144,7 @@
144 constraints: mem=1G144 constraints: mem=1G
145 options:145 options:
146 neutron-security-groups: True146 neutron-security-groups: True
147 vip: 10.5.108.1147 vip: "{{ MOJO_OS_VIP08 }}"
148 flat-network-providers: physnet1148 flat-network-providers: physnet1
149 neutron-api-hacluster:149 neutron-api-hacluster:
150 charm: hacluster150 charm: hacluster
151151
=== modified file 'helper/bundles/haphase1.yaml'
--- helper/bundles/haphase1.yaml 2017-09-05 21:37:34 +0000
+++ helper/bundles/haphase1.yaml 2017-09-11 15:47:43 +0000
@@ -29,7 +29,7 @@
29 options:29 options:
30 admin-password: openstack30 admin-password: openstack
31 admin-token: ubuntutesting31 admin-token: ubuntutesting
32 vip: 10.5.100.132 vip: "{{ MOJO_OS_VIP01 }}"
33 keystone-hacluster:33 keystone-hacluster:
34 charm: hacluster34 charm: hacluster
35 openstack-dashboard:35 openstack-dashboard:
@@ -37,7 +37,7 @@
37 constraints: mem=1G37 constraints: mem=1G
38 num_units: 238 num_units: 2
39 options:39 options:
40 vip: 10.5.100.240 vip: "{{ MOJO_OS_VIP02 }}"
41 dashboard-hacluster:41 dashboard-hacluster:
42 charm: hacluster42 charm: hacluster
43 nova-compute:43 nova-compute:
@@ -55,7 +55,7 @@
55 options:55 options:
56 network-manager: Neutron56 network-manager: Neutron
57 quantum-security-groups: "yes"57 quantum-security-groups: "yes"
58 vip: 10.5.100.358 vip: "{{ MOJO_OS_VIP03 }}"
59 ncc-hacluster:59 ncc-hacluster:
60 charm: hacluster60 charm: hacluster
61 neutron-gateway:61 neutron-gateway:
@@ -70,7 +70,7 @@
70 options:70 options:
71 block-device: "None"71 block-device: "None"
72 glance-api-version: 272 glance-api-version: 2
73 vip: 10.5.100.473 vip: "{{ MOJO_OS_VIP04 }}"
74 constraints": mem=1G74 constraints": mem=1G
75 cinder-hacluster:75 cinder-hacluster:
76 charm: hacluster76 charm: hacluster
@@ -81,7 +81,7 @@
81 constraints: mem=1G81 constraints: mem=1G
82 num_units: 282 num_units: 2
83 options:83 options:
84 vip: 10.5.100.584 vip: "{{ MOJO_OS_VIP05 }}"
85 glance-hacluster:85 glance-hacluster:
86 charm: hacluster86 charm: hacluster
87 swift-proxy:87 swift-proxy:
@@ -92,7 +92,7 @@
92 zone-assignment: manual92 zone-assignment: manual
93 replicas: 393 replicas: 3
94 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae94 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
95 vip: 10.5.100.695 vip: "{{ MOJO_OS_VIP06 }}"
96 swift-proxy-hacluster:96 swift-proxy-hacluster:
97 charm: hacluster97 charm: hacluster
98 swift-storage-z1:98 swift-storage-z1:
@@ -124,7 +124,7 @@
124 constraints: mem=1G124 constraints: mem=1G
125 num_units: 2125 num_units: 2
126 options:126 options:
127 vip: 10.5.100.10127 vip: "{{ MOJO_OS_VIP07 }}"
128 vip_cidr: 16128 vip_cidr: 16
129openstack-percona-database:129openstack-percona-database:
130 inherits: openstack-services130 inherits: openstack-services
@@ -134,7 +134,7 @@
134 constraints: mem=1G134 constraints: mem=1G
135 num_units: 2135 num_units: 2
136 options:136 options:
137 vip: 10.5.100.10137 vip: "{{ MOJO_OS_VIP08 }}"
138 vip_cidr: 16138 vip_cidr: 16
139 root-password: crapper139 root-password: crapper
140 sst-password: crapper140 sst-password: crapper
@@ -147,7 +147,7 @@
147 constraints: mem=1G147 constraints: mem=1G
148 options:148 options:
149 neutron-security-groups: True149 neutron-security-groups: True
150 vip: 10.5.108.1150 vip: "{{ MOJO_OS_VIP09 }}"
151 neutron-api-hacluster:151 neutron-api-hacluster:
152 charm: hacluster152 charm: hacluster
153 options:153 options:
154154
=== modified file 'helper/bundles/haphase2-next.yaml'
--- helper/bundles/haphase2-next.yaml 2017-09-05 21:37:34 +0000
+++ helper/bundles/haphase2-next.yaml 2017-09-11 15:47:43 +0000
@@ -26,7 +26,7 @@
26 options:26 options:
27 admin-password: openstack27 admin-password: openstack
28 admin-token: ubuntutesting28 admin-token: ubuntutesting
29 vip: 10.5.100.129 vip: "{{ MOJO_OS_VIP01 }}"
30 keystone-hacluster:30 keystone-hacluster:
31 charm: hacluster31 charm: hacluster
32 openstack-dashboard:32 openstack-dashboard:
@@ -34,7 +34,7 @@
34 constraints: mem=1G34 constraints: mem=1G
35 num_units: 235 num_units: 2
36 options:36 options:
37 vip: 10.5.100.237 vip: "{{ MOJO_OS_VIP02 }}"
38 dashboard-hacluster:38 dashboard-hacluster:
39 charm: hacluster39 charm: hacluster
40 nova-compute:40 nova-compute:
@@ -51,7 +51,7 @@
51 num_units: 251 num_units: 2
52 options:52 options:
53 network-manager: Neutron53 network-manager: Neutron
54 vip: 10.5.100.354 vip: "{{ MOJO_OS_VIP03 }}"
55 ncc-hacluster:55 ncc-hacluster:
56 charm: hacluster56 charm: hacluster
57 neutron-gateway:57 neutron-gateway:
@@ -67,7 +67,7 @@
67 options:67 options:
68 block-device: "None"68 block-device: "None"
69 glance-api-version: 269 glance-api-version: 2
70 vip: 10.5.100.470 vip: "{{ MOJO_OS_VIP04 }}"
71 constraints": mem=1G71 constraints": mem=1G
72 cinder-hacluster:72 cinder-hacluster:
73 charm: hacluster73 charm: hacluster
@@ -78,7 +78,7 @@
78 constraints: mem=1G78 constraints: mem=1G
79 num_units: 279 num_units: 2
80 options:80 options:
81 vip: 10.5.100.581 vip: "{{ MOJO_OS_VIP05 }}"
82 glance-hacluster:82 glance-hacluster:
83 charm: hacluster83 charm: hacluster
84 swift-proxy:84 swift-proxy:
@@ -89,7 +89,7 @@
89 zone-assignment: manual89 zone-assignment: manual
90 replicas: 390 replicas: 3
91 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae91 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
92 vip: 10.5.100.692 vip: "{{ MOJO_OS_VIP06 }}"
93 swift-proxy-hacluster:93 swift-proxy-hacluster:
94 charm: hacluster94 charm: hacluster
95 swift-storage-z1:95 swift-storage-z1:
@@ -162,7 +162,7 @@
162 constraints: mem=1G162 constraints: mem=1G
163 num_units: 2163 num_units: 2
164 options:164 options:
165 vip: 10.5.100.10165 vip: "{{ MOJO_OS_VIP07 }}"
166 vip_cidr: 16166 vip_cidr: 16
167openstack-percona-database:167openstack-percona-database:
168 inherits:168 inherits:
@@ -174,7 +174,7 @@
174 constraints: mem=1G174 constraints: mem=1G
175 num_units: 2175 num_units: 2
176 options:176 options:
177 vip: 10.5.100.10177 vip: "{{ MOJO_OS_VIP08 }}"
178 vip_cidr: 16178 vip_cidr: 16
179 root-password: crapper179 root-password: crapper
180 sst-password: crapper180 sst-password: crapper
@@ -187,7 +187,7 @@
187 constraints: mem=1G187 constraints: mem=1G
188 options:188 options:
189 neutron-security-groups: True189 neutron-security-groups: True
190 vip: 10.5.108.1190 vip: "{{ MOJO_OS_VIP09 }}"
191 flat-network-providers: physnet1191 flat-network-providers: physnet1
192 neutron-api-hacluster:192 neutron-api-hacluster:
193 charm: hacluster193 charm: hacluster
194194
=== modified file 'helper/bundles/haphase2.yaml'
--- helper/bundles/haphase2.yaml 2017-09-05 21:37:34 +0000
+++ helper/bundles/haphase2.yaml 2017-09-11 15:47:43 +0000
@@ -29,7 +29,7 @@
29 options:29 options:
30 admin-password: openstack30 admin-password: openstack
31 admin-token: ubuntutesting31 admin-token: ubuntutesting
32 vip: 10.5.100.132 vip: "{{ MOJO_OS_VIP01 }}"
33 keystone-hacluster:33 keystone-hacluster:
34 charm: hacluster34 charm: hacluster
35 openstack-dashboard:35 openstack-dashboard:
@@ -37,7 +37,7 @@
37 constraints: mem=1G37 constraints: mem=1G
38 num_units: 238 num_units: 2
39 options:39 options:
40 vip: 10.5.100.240 vip: "{{ MOJO_OS_VIP02 }}"
41 dashboard-hacluster:41 dashboard-hacluster:
42 charm: hacluster42 charm: hacluster
43 nova-compute:43 nova-compute:
@@ -55,7 +55,7 @@
55 options:55 options:
56 network-manager: Neutron56 network-manager: Neutron
57 quantum-security-groups: "yes"57 quantum-security-groups: "yes"
58 vip: 10.5.100.358 vip: "{{ MOJO_OS_VIP03 }}"
59 ncc-hacluster:59 ncc-hacluster:
60 charm: hacluster60 charm: hacluster
61 neutron-gateway:61 neutron-gateway:
@@ -70,7 +70,7 @@
70 options:70 options:
71 block-device: "None"71 block-device: "None"
72 glance-api-version: 272 glance-api-version: 2
73 vip: 10.5.100.473 vip: "{{ MOJO_OS_VIP04 }}"
74 constraints": mem=1G74 constraints": mem=1G
75 cinder-hacluster:75 cinder-hacluster:
76 charm: hacluster76 charm: hacluster
@@ -81,7 +81,7 @@
81 constraints: mem=1G81 constraints: mem=1G
82 num_units: 282 num_units: 2
83 options:83 options:
84 vip: 10.5.100.584 vip: "{{ MOJO_OS_VIP05 }}"
85 glance-hacluster:85 glance-hacluster:
86 charm: hacluster86 charm: hacluster
87 swift-proxy:87 swift-proxy:
@@ -92,7 +92,7 @@
92 zone-assignment: manual92 zone-assignment: manual
93 replicas: 393 replicas: 3
94 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae94 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
95 vip: 10.5.100.695 vip: "{{ MOJO_OS_VIP06 }}"
96 swift-proxy-hacluster:96 swift-proxy-hacluster:
97 charm: hacluster97 charm: hacluster
98 swift-storage-z1:98 swift-storage-z1:
@@ -166,7 +166,7 @@
166 constraints: mem=1G166 constraints: mem=1G
167 num_units: 2167 num_units: 2
168 options:168 options:
169 vip: 10.5.100.10169 vip: "{{ MOJO_OS_VIP07 }}"
170 vip_cidr: 16170 vip_cidr: 16
171openstack-percona-database:171openstack-percona-database:
172 inherits:172 inherits:
@@ -178,7 +178,7 @@
178 constraints: mem=1G178 constraints: mem=1G
179 num_units: 2179 num_units: 2
180 options:180 options:
181 vip: 10.5.100.10181 vip: "{{ MOJO_OS_VIP08 }}"
182 vip_cidr: 16182 vip_cidr: 16
183 root-password: crapper183 root-password: crapper
184 sst-password: crapper184 sst-password: crapper
@@ -191,7 +191,7 @@
191 constraints: mem=1G191 constraints: mem=1G
192 options:192 options:
193 neutron-security-groups: True193 neutron-security-groups: True
194 vip: 10.5.108.1194 vip: "{{ MOJO_OS_VIP09 }}"
195 neutron-api-hacluster:195 neutron-api-hacluster:
196 charm: hacluster196 charm: hacluster
197 options:197 options:
198198
=== modified file 'helper/bundles/swift-ha-proxy-phase1.yaml'
--- helper/bundles/swift-ha-proxy-phase1.yaml 2017-09-05 21:37:34 +0000
+++ helper/bundles/swift-ha-proxy-phase1.yaml 2017-09-11 15:47:43 +0000
@@ -23,7 +23,7 @@
23 options:23 options:
24 zone-assignment: manual24 zone-assignment: manual
25 replicas: 325 replicas: 3
26 vip: 10.5.100.126 vip: "{{ MOJO_OS_VIP01 }}"
27 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae27 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
28 disable-ring-balance: False28 disable-ring-balance: False
29 swift-storage-z1:29 swift-storage-z1:
3030
=== added file 'helper/setup/preflight.py'
--- helper/setup/preflight.py 1970-01-01 00:00:00 +0000
+++ helper/setup/preflight.py 2017-09-11 15:47:43 +0000
@@ -0,0 +1,44 @@
1#!/usr/bin/python
2
3import logging
4import os
5
6REQUIRED = [
7 'MOJO_STAGE',
8 'MOJO_WORKSPACE',
9 'MOJO_PROJECT',
10 'MOJO_SERIES',
11 'MOJO_SPEC',
12 'OS_REGION_NAME',
13 'OS_PASSWORD',
14 'OS_AUTH_URL',
15 'OS_USERNAME',
16 'OS_PROJECT_NAME',
17 'MOJO_OS_VIP01',
18 'MOJO_OS_VIP02',
19 'MOJO_OS_VIP03',
20 'MOJO_OS_VIP04',
21 'MOJO_OS_VIP05',
22 'MOJO_OS_VIP06',
23 'MOJO_OS_VIP07',
24 'MOJO_OS_VIP08',
25 'MOJO_OS_VIP09',
26]
27
28
29class MissingEnvVariableExeption(Exception):
30 pass
31
32
33logging.info("Running pre-flight check for environment variables")
34for var in REQUIRED:
35 if os.environ.get(var) is None:
36 raise MissingEnvVariableExeption(
37 "The variable, {}, is missing from the environment.\n"
38 "Make sure all required variables in the {} "
39 "script are available before running mojo\n\n"
40 "Required: {}"
41 "".format(var, os.path.basename(__file__),
42 ", ".join(REQUIRED)))
43
44logging.debug("All required environment variables successfully found.")
045
=== modified file 'specs/full_stack/next_ha_oneshot/icehouse/manifest'
--- specs/full_stack/next_ha_oneshot/icehouse/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_ha_oneshot/icehouse/manifest 2017-09-11 15:47:43 +0000
@@ -1,3 +1,6 @@
1# Validate env variables
2script config=preflight.py
3
1# Collect the charm branches from Launchpad4# Collect the charm branches from Launchpad
2collect config=collect-next-ha5collect config=collect-next-ha
36
47
=== added symlink 'specs/full_stack/next_ha_oneshot/icehouse/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== modified file 'specs/full_stack/next_ha_oneshot/kilo/manifest'
--- specs/full_stack/next_ha_oneshot/kilo/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_ha_oneshot/kilo/manifest 2017-09-11 15:47:43 +0000
@@ -1,3 +1,6 @@
1# Validate env variables
2script config=preflight.py
3
1# Collect the charm branches from Launchpad4# Collect the charm branches from Launchpad
2collect config=collect-next-ha5collect config=collect-next-ha
36
47
=== added symlink 'specs/full_stack/next_ha_oneshot/kilo/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== modified file 'specs/full_stack/next_ha_oneshot/liberty/manifest'
--- specs/full_stack/next_ha_oneshot/liberty/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_ha_oneshot/liberty/manifest 2017-09-11 15:47:43 +0000
@@ -1,3 +1,6 @@
1# Validate env variables
2script config=preflight.py
3
1# Collect the charm branches from Launchpad4# Collect the charm branches from Launchpad
2collect config=collect-next-ha5collect config=collect-next-ha
36
47
=== added symlink 'specs/full_stack/next_ha_oneshot/liberty/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== modified file 'specs/full_stack/next_ha_oneshot/mitaka/manifest'
--- specs/full_stack/next_ha_oneshot/mitaka/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_ha_oneshot/mitaka/manifest 2017-09-11 15:47:43 +0000
@@ -1,3 +1,6 @@
1# Validate env variables
2script config=preflight.py
3
1# Collect the charm branches from Launchpad4# Collect the charm branches from Launchpad
2collect config=collect-next-ha5collect config=collect-next-ha
36
47
=== added symlink 'specs/full_stack/next_ha_oneshot/mitaka/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== modified file 'specs/full_stack/next_ha_oneshot/newton/manifest'
--- specs/full_stack/next_ha_oneshot/newton/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_ha_oneshot/newton/manifest 2017-09-11 15:47:43 +0000
@@ -1,3 +1,6 @@
1# Validate env variables
2script config=preflight.py
3
1# Collect the charm branches from Launchpad4# Collect the charm branches from Launchpad
2collect config=collect-next-ha5collect config=collect-next-ha
36
47
=== added symlink 'specs/full_stack/next_ha_oneshot/newton/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== modified file 'specs/full_stack/next_ha_oneshot/ocata/manifest'
--- specs/full_stack/next_ha_oneshot/ocata/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_ha_oneshot/ocata/manifest 2017-09-11 15:47:43 +0000
@@ -1,3 +1,6 @@
1# Validate env variables
2script config=preflight.py
3
1# Collect the charm branches from Launchpad4# Collect the charm branches from Launchpad
2collect config=collect-next-ha5collect config=collect-next-ha
36
47
=== added symlink 'specs/full_stack/next_ha_oneshot/ocata/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'
=== modified file 'specs/full_stack/next_ha_oneshot/pike/manifest'
--- specs/full_stack/next_ha_oneshot/pike/manifest 2017-08-30 17:25:03 +0000
+++ specs/full_stack/next_ha_oneshot/pike/manifest 2017-09-11 15:47:43 +0000
@@ -1,3 +1,6 @@
1# Validate env variables
2script config=preflight.py
3
1# Collect the charm branches from Launchpad4# Collect the charm branches from Launchpad
2collect config=collect-next-ha5collect config=collect-next-ha
36
47
=== added symlink 'specs/full_stack/next_ha_oneshot/pike/preflight.py'
=== target is u'../../../../helper/setup/preflight.py'

Subscribers

People subscribed via source and target branches