summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/config_tpl/bundle_tpl/ceilometer.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/cinder.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/glance.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/heat.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/keystone.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/neutron-api.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/neutron-gateway.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/neutron-ovs.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/nova-compute.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/oclphase1.yaml11
-rw-r--r--ci/config_tpl/bundle_tpl/openstack-dashboard.yaml1
-rw-r--r--ci/config_tpl/bundle_tpl/phase2-overrides.yaml6
-rw-r--r--ci/config_tpl/bundle_tpl/relations.yaml31
-rw-r--r--ci/config_tpl/bundle_tpl/subordinate.yaml18
-rwxr-xr-xci/opencontrail/fetch-charms.sh14
-rw-r--r--labconfig/juniper/pod1/labconfig.yaml4
17 files changed, 63 insertions, 32 deletions
diff --git a/ci/config_tpl/bundle_tpl/ceilometer.yaml b/ci/config_tpl/bundle_tpl/ceilometer.yaml
index 031551a5..ef706305 100644
--- a/ci/config_tpl/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/bundle_tpl/ceilometer.yaml
@@ -6,6 +6,7 @@
charm: "local:{{ ubuntu.release }}/ceilometer"
num_units: {{ unit_qty() }}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.ceilometer }}
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/cinder.yaml b/ci/config_tpl/bundle_tpl/cinder.yaml
index 1d703721..82e18737 100644
--- a/ci/config_tpl/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/bundle_tpl/cinder.yaml
@@ -6,6 +6,7 @@
num_units: {{ unit_qty() }}
{% endif %}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.cinder }}
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/glance.yaml b/ci/config_tpl/bundle_tpl/glance.yaml
index 84999326..50ee54b9 100644
--- a/ci/config_tpl/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/bundle_tpl/glance.yaml
@@ -2,6 +2,7 @@
charm: "local:{{ ubuntu.release }}/glance"
num_units: {{ unit_qty() }}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% 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 119a557b..087cd4fc 100644
--- a/ci/config_tpl/bundle_tpl/heat.yaml
+++ b/ci/config_tpl/bundle_tpl/heat.yaml
@@ -2,6 +2,7 @@
charm: "local:{{ ubuntu.release }}/heat"
# num_units: {{ unit_qty() }}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% 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 24f5b102..991dfa4b 100644
--- a/ci/config_tpl/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/bundle_tpl/keystone.yaml
@@ -2,6 +2,7 @@
charm: "local:{{ ubuntu.release }}/keystone"
num_units: {{ unit_qty() }}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
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 4de6e07e..807d9f42 100644
--- a/ci/config_tpl/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-api.yaml
@@ -2,6 +2,7 @@
charm: "local:{{ ubuntu.release }}/neutron-api"
num_units: {{ unit_qty() }}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
neutron-security-groups: true
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.neutron }}
diff --git a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
index 07195503..7b97d478 100644
--- a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml
@@ -1,6 +1,7 @@
neutron-gateway:
charm: "local:{{ ubuntu.release }}/neutron-gateway"
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/neutron-ovs.yaml b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
index 6823ca86..800f470c 100644
--- a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml
@@ -1,6 +1,7 @@
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 88e3f730..05ece877 100644
--- a/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml
@@ -2,6 +2,7 @@
charm: "local:{{ ubuntu.release }}/nova-cloud-controller"
num_units: {{ unit_qty() }}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
#console-access-protocol: novnc
neutron-external-network: ext-net
service-guard: true
diff --git a/ci/config_tpl/bundle_tpl/nova-compute.yaml b/ci/config_tpl/bundle_tpl/nova-compute.yaml
index 03118899..0a9305af 100644
--- a/ci/config_tpl/bundle_tpl/nova-compute.yaml
+++ b/ci/config_tpl/bundle_tpl/nova-compute.yaml
@@ -10,6 +10,7 @@
{% endif %}
{% endif %}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
diff --git a/ci/config_tpl/bundle_tpl/oclphase1.yaml b/ci/config_tpl/bundle_tpl/oclphase1.yaml
index 5781ebc6..ebb69c4e 100644
--- a/ci/config_tpl/bundle_tpl/oclphase1.yaml
+++ b/ci/config_tpl/bundle_tpl/oclphase1.yaml
@@ -22,7 +22,7 @@
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.contrailconfig }}
{% endif %}
- install-sources: ppa:opencontrail/trunk-20160812
+ install-sources: ppa:opencontrail/trunk-20160812
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
@@ -30,7 +30,8 @@
contrail-control:
charm: local:{{ ubuntu.release }}/contrail-control
num_units: {{ unit_qty() }}
- install-sources: ppa:opencontrail/trunk-20160812
+ options:
+ install-sources: ppa:opencontrail/trunk-20160812
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
@@ -38,7 +39,8 @@
contrail-analytics:
charm: local:{{ ubuntu.release }}/contrail-analytics
num_units: {{ unit_qty() }}
- install-sources: ppa:opencontrail/trunk-20160812
+ options:
+ install-sources: ppa:opencontrail/trunk-20160812
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
@@ -46,7 +48,8 @@
contrail-webui:
charm: local:{{ ubuntu.release }}/contrail-webui
num_units: {{ unit_qty() }}
- install-sources: ppa:opencontrail/trunk-20160812
+ options:
+ install-sources: ppa:opencontrail/trunk-20160812
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
diff --git a/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml
index 83408dcd..db83d5bf 100644
--- a/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml
+++ b/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml
@@ -2,6 +2,7 @@
charm: "local:{{ ubuntu.release }}/openstack-dashboard"
num_units: {{ unit_qty() }}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
secret: admin
webroot: /
{% if os.ha.mode == 'ha' %}
diff --git a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml
index c38af914..2063607f 100644
--- a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml
+++ b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml
@@ -23,14 +23,14 @@
{% endif %}
region: {{ os.region }}
{% if ubuntu.release == 'trusty' %}
- source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ #source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% endif %}
{% if ubuntu.release == 'xenial' %}
{% if os.release == 'newton' %}
- source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ #source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% endif %}
{% endif %}
- openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ #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() }}
diff --git a/ci/config_tpl/bundle_tpl/relations.yaml b/ci/config_tpl/bundle_tpl/relations.yaml
index 8dd64759..6d4d70c7 100644
--- a/ci/config_tpl/bundle_tpl/relations.yaml
+++ b/ci/config_tpl/bundle_tpl/relations.yaml
@@ -74,32 +74,35 @@
- [ 'openvswitch-onos:ovsdb-manager', 'onos-controller:ovsdb-manager' ]
- [ 'neutron-api-onos:onos-controller', 'onos-controller:controller-api' ]
{% elif os.network.controller == 'ocl' %}
+ - [ 'kafka', 'zookeeper' ]
- [ 'contrail-configuration:cassandra', 'cassandra:database' ]
+ - [ 'contrail-configuration:contrail-analytics-api', 'contrail-analytics:contrail-analytics-api' ]
- [ 'contrail-configuration', 'zookeeper' ]
- [ 'contrail-configuration', 'rabbitmq-server' ]
- [ 'contrail-configuration', 'keystone' ]
- - [ 'neutron-api-contrail', 'contrail-configuration' ]
- - [ 'neutron-api-contrail', 'keystone' ]
- - [ 'contrail-control:contrail-api', 'contrail-configuration:contrail-api' ]
+ - [ 'contrail-configuration', 'haproxy' ]
+ - [ 'contrail-analytics:cassandra', 'cassandra:database' ]
+ - [ 'contrail-analytics:contrail-api', 'contrail-configuration:contrail-api' ]
+ - [ 'contrail-analytics:contrail-discovery', 'contrail-configuration:contrail-discovery' ]
+ - [ 'contrail-analytics', 'kafka' ]
+ - [ 'contrail-analytics', 'zookeeper' ]
+ - [ 'contrail-analytics', 'keystone' ]
+ - [ 'contrail-analytics', 'haproxy' ]
- [ 'contrail-control:contrail-discovery', 'contrail-configuration:contrail-discovery' ]
- [ 'contrail-control:contrail-ifmap', 'contrail-configuration:contrail-ifmap' ]
+ - [ 'contrail-control:contrail-api', 'contrail-configuration:contrail-api' ]
- [ 'contrail-control', 'keystone' ]
- - [ 'contrail-analytics:cassandra', 'cassandra:database' ]
- - [ 'contrail-analytics:contrail-analytics-api', 'contrail-configuration:contrail-analytics-api' ]
- - [ 'contrail-configuration:contrail-discovery', 'contrail-analytics:contrail-discovery' ]
+ - [ 'neutron-api-contrail', 'contrail-configuration' ]
+ - [ 'neutron-api-contrail', 'keystone' ]
- [ 'contrail-webui', 'keystone' ]
- [ 'contrail-webui:contrail_api', 'contrail-configuration:contrail-api' ]
- [ 'contrail-webui:contrail_discovery', 'contrail-configuration:contrail-discovery' ]
- [ 'contrail-webui:cassandra', 'cassandra:database' ]
- - [ 'nova-compute', 'neutron-contrail' ]
+ - [ 'contrail-webui', 'haproxy' ]
+ - [ 'neutron-contrail', 'keystone' ]
- [ 'neutron-contrail:contrail-discovery', 'contrail-configuration:contrail-discovery' ]
- [ 'neutron-contrail:contrail-api', 'contrail-configuration:contrail-api' ]
- - [ 'neutron-contrail', 'keystone' ]
- - [ 'contrail-configuration', 'ntp' ]
- - [ 'contrail-control', 'ntp' ]
- - [ 'contrail-analytics', 'ntp' ]
- - [ 'contrail-configuration', 'haproxy' ]
- - [ 'contrail-analytics', 'haproxy' ]
- - [ 'contrail-webui', 'haproxy' ]
- [ 'haproxy', 'keepalived' ]
+ - [ 'ceilometer', 'ceilometer-contrail' ]
+ - [ 'ceilometer-contrail', 'contrail-analytics' ]
{% endif %}
diff --git a/ci/config_tpl/bundle_tpl/subordinate.yaml b/ci/config_tpl/bundle_tpl/subordinate.yaml
index 178328f4..65e065a6 100644
--- a/ci/config_tpl/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/bundle_tpl/subordinate.yaml
@@ -1,8 +1,12 @@
ceilometer-agent:
charm: local:{{ ubuntu.release }}/ceilometer-agent
+ options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% if opnfv.storage_dict.ceph is defined %}
cinder-ceph:
charm: local:{{ ubuntu.release }}/cinder-ceph
+ options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% endif %}
{% if os.network.controller == 'nosdn' %}
{% include 'neutron-ovs.yaml' %}
@@ -15,6 +19,7 @@
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 %}
@@ -34,15 +39,22 @@
profile: onos-sfc
{% endif %}
{% elif os.network.controller == 'ocl' %}
+ ceilometer-contrail:
+ charm: local:{{ ubuntu.release }}/ceilometer-contrail
+ options:
+ install-sources: ppa:opencontrail/trunk-20160812
neutron-api-contrail:
charm: local:{{ ubuntu.release }}/neutron-api-contrail
- install-sources: ppa:opencontrail/trunk-20160812
+ options:
+ install-sources: ppa:opencontrail/trunk-20160812
neutron-contrail:
charm: local:{{ ubuntu.release }}/neutron-contrail
- install-sources: ppa:opencontrail/trunk-20160812
+ options:
+ install-sources: ppa:opencontrail/trunk-20160812
keepalived:
charm: local:{{ ubuntu.release }}/keepalived
options:
+ router-id: 1
{% if os.ha.mode == 'ha' %}
virtual-ip: {{ opnfv.vip.keepalived }}
{% endif %}
@@ -50,6 +62,8 @@
{% if os.lxd %}
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 53dc7361..3d033958 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -12,7 +12,7 @@ function build {
# openstack
bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
-charm pull cs:$distro/mongodb $distro/mongodb
+charm pull cs:trusty/mongodb $distro/mongodb
charm pull cs:$distro/haproxy $distro/haproxy
charm pull cs:$distro/ntp $distro/ntp
@@ -22,7 +22,7 @@ git clone -b stable/16.07 https://github.com/openstack/charm-aodh.git $distro/ch
build aodh
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
+#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
@@ -63,15 +63,15 @@ git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $di
#charm pull cs:~openstack-charmers-next/lxd xenial/lxd
# Controller specific charm
-charm pull cs:$distro/apache-kafka $distro/kafka
+charm pull cs:trusty/apache-kafka $distro/kafka
bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived
bzr branch lp:~sdn-charmers/charms/$distro/cassandra/ufw $distro/cassandra
bzr branch lp:~sdn-charmers/charms/$distro/contrail-analytics/trunk $distro/contrail-analytics
bzr branch lp:~sdn-charmers/charms/$distro/contrail-configuration/trunk $distro/contrail-configuration
bzr branch lp:~sdn-charmers/charms/$distro/contrail-control/trunk $distro/contrail-control
bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail-webui
-charm pull cs:$distro/apache-zookeeper $distro/zookeeper
-bzr branch lp:~opnfv-team/charms/$distro/neutron-api-contrail/trunk $distro/neutron-api-contrail
-bzr branch lp:~opnfv-team/charms/$distro/neutron-contrail/trunk $distro/neutron-contrail
-bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer-plugin
+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
bzr branch lp:~sdn-charmers/charms/$distro/ceilometer-contrail/trunk $distro/ceilometer-contrail
diff --git a/labconfig/juniper/pod1/labconfig.yaml b/labconfig/juniper/pod1/labconfig.yaml
index 3ec606db..369b6a1c 100644
--- a/labconfig/juniper/pod1/labconfig.yaml
+++ b/labconfig/juniper/pod1/labconfig.yaml
@@ -78,7 +78,7 @@ lab:
address: 10.10.7.85
user: ADMIN
pass: ADMIN
- floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24
+ floating-ip-range: 10.10.10.6,10.10.10.250,10.10.10.1,10.10.10.0/24
ext-port: "eth1"
dns: 8.8.8.8
osdomainname:
@@ -101,6 +101,6 @@ opnfv:
vlan:
- type: public
bridge: brPublic
- cidr: 10.10.0.0/28
+ cidr: 10.10.10.0/24
gateway: 10.10.10.1
vlan: