Merge lp://staging/~jjo/openstack-mojo-specs/mojo-openstack-specs-add-mojo-bootstack-specs into lp://staging/openstack-mojo-specs
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~jjo/openstack-mojo-specs/mojo-openstack-specs-add-mojo-bootstack-specs |
| Merge into: | lp://staging/openstack-mojo-specs |
| Diff against target: |
1843 lines (+1281/-72) 22 files modified
helper/setup/allow_vips_addresses.py (+75/-0) helper/setup/bootstrap_ha.py (+74/-0) helper/setup/images.yaml (+2/-1) helper/setup/network_setup.py (+28/-15) helper/tests/simple_os_checks.py (+3/-0) helper/tests/test_obj_store.py (+12/-0) helper/utils/mojo_os_utils.py (+25/-19) helper/utils/mojo_utils.py (+93/-19) specs/bootstack/customer/configs/bootstack-charms.bzr (+35/-0) specs/bootstack/customer/configs/bootstack-example.yaml (+735/-0) specs/bootstack/customer/configs/bootstack-repo (+24/-0) specs/bootstack/customer/configs/glance-streams.yaml (+7/-0) specs/bootstack/customer/configs/keystone_users.yaml (+5/-0) specs/bootstack/customer/configs/network.yaml (+14/-0) specs/bootstack/ha_phased/icehouse/SPEC_INFO.txt (+2/-0) specs/bootstack/ha_phased/icehouse/bootstack-charms-1504.bzr (+35/-0) specs/bootstack/ha_phased/icehouse/bootstack-charms-trunk.bzr (+35/-0) specs/bootstack/ha_phased/icehouse/fix-lxcbr0.sh (+2/-0) specs/bootstack/ha_phased/icehouse/manifest (+53/-0) specs/dev/nova_cc_legacy_neutron/simple_os_checks.py (+3/-0) specs/dev/nova_cc_legacy_neutron/utils/mojo_os_utils.py (+18/-17) specs/dev/nova_cc_legacy_neutron/utils/mojo_utils.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~jjo/openstack-mojo-specs/mojo-openstack-specs-add-mojo-bootstack-specs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charm Testing Maintainers | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 219. By JuanJo Ciarlante
-
[jjo, r=] add bootstack to mojo-openstack-
specs
* generalize mojo_utils.py and mojo_os_utils.py functions to support
arbitrary net_name, subnet_name, etc
* network_setup.py: support skipping undercloud network setup if undercloud
is not nova (eg MaaS)
* add helper/setup/allow_ vips_addresses. py, similar to setup_vips.py but
with a different approach to carve unused IPs, plus doing neutron
allowed_address_ pairs to VIP'd service units
* add helper/setup/bootstrap _ha.py
* add bootstack-charms- 1504.bzr
* simple_os_checks. py: add --net_name arg, move it off mojo_os_utils.py
* add specs/bootstack/ha_phased and specs/bootstack /customer/ configs
- based on 'bootstack-example' configs branch
- has secrets fully included, to avoid the need for /srv/mojo/LOCAL
setup
- note the extensive usage of YAML aliases (~varnames)
- note the 'mysql' servicename (albeit using percona-cluster charm)
- stages:
- stage1: services that reside in metal
- stage2: LXC'able and smooshed services, hacluster srv+relations
- stage2-relations: inter-service relations
- stage2-complete: num_units from 2 to 3, for VIP'd services
