summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ci/config_tpl/bundle_tpl/ceilometer.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/ceph.yaml4
-rw-r--r--ci/config_tpl/bundle_tpl/cinder.yaml7
-rw-r--r--ci/config_tpl/bundle_tpl/congress.yaml3
-rw-r--r--ci/config_tpl/bundle_tpl/glance.yaml7
-rw-r--r--ci/config_tpl/bundle_tpl/heat.yaml4
-rw-r--r--ci/config_tpl/bundle_tpl/keystone.yaml4
-rw-r--r--ci/config_tpl/bundle_tpl/neutron-api.yaml10
-rw-r--r--ci/config_tpl/bundle_tpl/neutron-gateway.yaml3
-rw-r--r--ci/config_tpl/bundle_tpl/neutron-ovs.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml4
-rw-r--r--ci/config_tpl/bundle_tpl/nova-compute.yaml3
-rw-r--r--ci/config_tpl/bundle_tpl/phase2-overrides.yaml18
-rw-r--r--ci/config_tpl/bundle_tpl/rabbitmq.yaml3
-rw-r--r--ci/config_tpl/bundle_tpl/subordinate.yaml6
-rwxr-xr-xci/opencontrail/fetch-charms.sh4
16 files changed, 65 insertions, 17 deletions
diff --git a/ci/config_tpl/bundle_tpl/ceilometer.yaml b/ci/config_tpl/bundle_tpl/ceilometer.yaml
index ef706305..e7b0d924 100644
--- a/ci/config_tpl/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/bundle_tpl/ceilometer.yaml
@@ -7,6 +7,7 @@
num_units: {{ unit_qty() }}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ region: {{ os.region }}
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.ceilometer }}
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/ceph.yaml b/ci/config_tpl/bundle_tpl/ceph.yaml
index 10b96843..faddbc35 100644
--- a/ci/config_tpl/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/bundle_tpl/ceph.yaml
@@ -55,8 +55,12 @@
charm: "local:{{ ubuntu.release }}/ceph-radosgw"
num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }}
options:
+ region: {{ os.region }}
use-embedded-webserver: true
operator-roles: "Member,admin"
+{% if opnfv.storage_dict.ceph is defined %}
+ ceph-osd-replication-count: {{ unit_ceph_qty() }}
+{% endif %}
to:
{% for unit_id in to_select(unit_qty() if os.beta.hacluster_ceph_radosgw else 1) %}
- "lxc:nodes={{ unit_id }}"
diff --git a/ci/config_tpl/bundle_tpl/cinder.yaml b/ci/config_tpl/bundle_tpl/cinder.yaml
index 82e18737..bf3fb04c 100644
--- a/ci/config_tpl/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/bundle_tpl/cinder.yaml
@@ -7,6 +7,13 @@
{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ region: {{ os.region }}
+{% if os.api.worker_multiplier %}
+ worker-multiplier: {{ os.api.worker_multiplier }}
+{% endif %}
+{% if opnfv.storage_dict.ceph is defined %}
+ ceph-osd-replication-count: {{ unit_ceph_qty() }}
+{% endif %}
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.cinder }}
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/congress.yaml b/ci/config_tpl/bundle_tpl/congress.yaml
index 3d05295e..7d68f1d6 100644
--- a/ci/config_tpl/bundle_tpl/congress.yaml
+++ b/ci/config_tpl/bundle_tpl/congress.yaml
@@ -1,7 +1,8 @@
congress:
charm: "local:{{ ubuntu.release }}/congress"
-{% if ubuntu.release == 'trusty' %}
options:
+ region: {{ os.region }}
+{% if ubuntu.release == 'trusty' %}
source-branch: "stable/{{ os.release }}"
{% endif %}
to:
diff --git a/ci/config_tpl/bundle_tpl/glance.yaml b/ci/config_tpl/bundle_tpl/glance.yaml
index 50ee54b9..6c884465 100644
--- a/ci/config_tpl/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/bundle_tpl/glance.yaml
@@ -3,6 +3,13 @@
num_units: {{ unit_qty() }}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ region: {{ os.region }}
+{% if opnfv.storage_dict.ceph is defined %}
+ ceph-osd-replication-count: {{ unit_ceph_qty() }}
+{% endif %}
+{% if os.api.worker_multiplier %}
+ worker-multiplier: {{ os.api.worker_multiplier }}
+{% endif %}
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.glance }}
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/heat.yaml b/ci/config_tpl/bundle_tpl/heat.yaml
index 087cd4fc..58d039d8 100644
--- a/ci/config_tpl/bundle_tpl/heat.yaml
+++ b/ci/config_tpl/bundle_tpl/heat.yaml
@@ -3,6 +3,10 @@
# num_units: {{ unit_qty() }}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ region: {{ os.region }}
+{% if os.api.worker_multiplier %}
+ worker-multiplier: {{ os.api.worker_multiplier }}
+{% endif %}
{% if os.ha.mode == 'ha' %}
# vip: {{ opnfv.vip.heat }}
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/keystone.yaml b/ci/config_tpl/bundle_tpl/keystone.yaml
index 991dfa4b..d8c778c3 100644
--- a/ci/config_tpl/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/bundle_tpl/keystone.yaml
@@ -3,6 +3,10 @@
num_units: {{ unit_qty() }}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ region: {{ os.region }}
+{% if os.api.worker_multiplier %}
+ worker-multiplier: {{ os.api.worker_multiplier }}
+{% endif %}
admin-password: {{ opnfv.admin_password | default(os.admin.password) }}
admin-token: {{ os.admin.name }}
{% if os.ha.mode == 'ha' %}
diff --git a/ci/config_tpl/bundle_tpl/neutron-api.yaml b/ci/config_tpl/bundle_tpl/neutron-api.yaml
index 807d9f42..0ae0a97d 100644
--- a/ci/config_tpl/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-api.yaml
@@ -3,7 +3,11 @@
num_units: {{ unit_qty() }}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ region: {{ os.region }}
neutron-security-groups: true
+{% if os.api.worker_multiplier %}
+ worker-multiplier: {{ os.api.worker_multiplier }}
+{% endif %}
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.neutron }}
{% endif %}
@@ -21,6 +25,12 @@
{% if os.beta.public_api %}
os-public-hostname: api.{{ opnfv.domain }}
{% endif %}
+{% if os.network.dvr %}
+ enable-dvr: true
+{% endif %}
+{% if os.network.l2_population %}
+ l2-population: true
+{% endif %}
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
diff --git a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
index 7b97d478..ab58f5a7 100644
--- a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
@@ -2,6 +2,9 @@
charm: "local:{{ ubuntu.release }}/neutron-gateway"
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% if os.api.worker_multiplier %}
+ worker-multiplier: {{ os.api.worker_multiplier }}
+{% endif %}
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
index 800f470c..6823ca86 100644
--- a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
@@ -1,7 +1,6 @@
neutron-openvswitch:
charm: local:{{ ubuntu.release }}/neutron-openvswitch
options:
- openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml
index 05ece877..38aa7d32 100644
--- a/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml
@@ -3,9 +3,13 @@
num_units: {{ unit_qty() }}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ region: {{ os.region }}
#console-access-protocol: novnc
neutron-external-network: ext-net
service-guard: true
+{% if os.api.worker_multiplier %}
+ worker-multiplier: {{ os.api.worker_multiplier }}
+{% endif %}
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.nova }}
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/nova-compute.yaml b/ci/config_tpl/bundle_tpl/nova-compute.yaml
index 0a9305af..456ac417 100644
--- a/ci/config_tpl/bundle_tpl/nova-compute.yaml
+++ b/ci/config_tpl/bundle_tpl/nova-compute.yaml
@@ -14,6 +14,9 @@
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
+{% if opnfv.storage_dict.ceph is defined %}
+ ceph-osd-replication-count: {{ unit_ceph_qty() }}
+{% endif %}
{% if os.beta.huge_pages %}
hugepages: "50%"
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml
index 2063607f..12b8905a 100644
--- a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml
+++ b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml
@@ -6,22 +6,21 @@
{% endif %}
{% if os.ha.mode == 'ha' %}
{% if os.api.haproxy_timeout %}
- haproxy-server-timeout: {{ os.api.haproxy_timeout }}
- haproxy-client-timeout: {{ os.api.haproxy_timeout }}
- haproxy-queue-timeout: {{ os.api.haproxy_timeout }}
- haproxy-connect-timeout: {{ os.api.haproxy_timeout }}
+ #haproxy-server-timeout: {{ os.api.haproxy_timeout }}
+ #haproxy-client-timeout: {{ os.api.haproxy_timeout }}
+ #haproxy-queue-timeout: {{ os.api.haproxy_timeout }}
+ #haproxy-connect-timeout: {{ os.api.haproxy_timeout }}
{% endif %}
{% endif %}
{% if os.api.worker_multiplier %}
- worker-multiplier: {{ os.api.worker_multiplier }}
+ #worker-multiplier: {{ os.api.worker_multiplier }}
{% endif %}
{% if os.network.dvr %}
- enable-dvr: true
+ #enable-dvr: true
{% endif %}
{% if os.network.l2_population %}
- l2-population: true
+ #l2-population: true
{% endif %}
- region: {{ os.region }}
{% if ubuntu.release == 'trusty' %}
#source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% endif %}
@@ -30,10 +29,9 @@
#source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% endif %}
{% endif %}
- #openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% if os.ha.mode == 'nonha' %}
{% if opnfv.storage_dict.ceph is defined %}
- ceph-osd-replication-count: {{ unit_ceph_qty() }}
+ #ceph-osd-replication-count: {{ unit_ceph_qty() }}
{% endif %}
{% endif %}
admin-role: {{ os.admin.role }}
diff --git a/ci/config_tpl/bundle_tpl/rabbitmq.yaml b/ci/config_tpl/bundle_tpl/rabbitmq.yaml
index 1020340f..17d764d3 100644
--- a/ci/config_tpl/bundle_tpl/rabbitmq.yaml
+++ b/ci/config_tpl/bundle_tpl/rabbitmq.yaml
@@ -2,6 +2,9 @@
charm: "local:{{ ubuntu.release }}/rabbitmq-server"
num_units: {{ unit_qty() }}
options:
+{% if opnfv.storage_dict.ceph is defined %}
+ ceph-osd-replication-count: {{ unit_ceph_qty() }}
+{% endif %}
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.rabbitmq }}
min-cluster-size: {{ unit_qty() }}
diff --git a/ci/config_tpl/bundle_tpl/subordinate.yaml b/ci/config_tpl/bundle_tpl/subordinate.yaml
index 65e065a6..3f043dc1 100644
--- a/ci/config_tpl/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/bundle_tpl/subordinate.yaml
@@ -6,7 +6,9 @@
cinder-ceph:
charm: local:{{ ubuntu.release }}/cinder-ceph
options:
- openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% if opnfv.storage_dict.ceph is defined %}
+ ceph-osd-replication-count: {{ unit_ceph_qty() }}
+{% endif %}
{% endif %}
{% if os.network.controller == 'nosdn' %}
{% include 'neutron-ovs.yaml' %}
@@ -19,7 +21,6 @@
openvswitch-odl:
charm: local:{{ ubuntu.release }}/openvswitch-odl
options:
- openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
{% endif %}
@@ -63,7 +64,6 @@
lxd:
charm: local:{{ ubuntu.release }}/lxd
options:
- openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% endif %}
{% if opnfv.storage_dict.scaleio is defined %}
scaleio-openstack:
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 55500949..402132c6 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -21,7 +21,8 @@ git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
build congress
git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer
+#git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph
git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
@@ -72,5 +73,4 @@ bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail
charm pull cs:trusty/apache-zookeeper $distro/zookeeper
bzr branch lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk $distro/neutron-api-contrail
bzr branch lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk $distro/neutron-contrail
-bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer-contrail
bzr branch lp:~sdn-charmers/charms/$distro/ceilometer-contrail/trunk $distro/ceilometer-contrail