diff options
| -rw-r--r-- | ci/config_tpl/bundle_tpl/aodh.yaml | 2 | ||||
| -rwxr-xr-x | ci/nosdn/fetch-charms.sh | 3 | ||||
| -rwxr-xr-x | ci/odl/fetch-charms.sh | 4 | ||||
| -rwxr-xr-x | ci/onos/fetch-charms.sh | 4 | ||||
| -rwxr-xr-x | ci/opencontrail/fetch-charms.sh | 3 |
5 files changed, 8 insertions, 8 deletions
diff --git a/ci/config_tpl/bundle_tpl/aodh.yaml b/ci/config_tpl/bundle_tpl/aodh.yaml index 271d3819..b2671e69 100644 --- a/ci/config_tpl/bundle_tpl/aodh.yaml +++ b/ci/config_tpl/bundle_tpl/aodh.yaml @@ -1,5 +1,7 @@ aodh: charm: "local:{{ ubuntu.release }}/aodh" + options: + openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" to: - "lxc:nodes=0" {# Empty block to avoid bad block trim #} diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index 278f0c5d..4a220ff2 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -16,8 +16,6 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress build congress -git clone https://github.com/openstack/charm-aodh.git $distro/charm-aodh -build aodh git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer @@ -41,6 +39,7 @@ git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbit git clone https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/openstack/charm-lxd.git xenial/lxd +charm pull cs:$distro/aodh $distro/aodh charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index 10bcddf0..606b1261 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -16,8 +16,6 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress build congress -git clone https://github.com/openstack/charm-aodh.git $distro/charm-aodh -build aodh git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer @@ -41,6 +39,8 @@ git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbit git clone https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/openstack/charm-lxd.git xenial/lxd +charm pull cs:$distro/aodh $distro/aodh + #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer #charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index 5e3c20d7..01491ecf 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/fetch-charms.sh @@ -16,8 +16,6 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress build congress -git clone https://github.com/openstack/charm-aodh.git $distro/charm-aodh -build aodh git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer @@ -40,6 +38,8 @@ git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbit git clone https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/openstack/charm-lxd.git $distro/lxd +charm pull cs:$distro/aodh $distro/aodh + #charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster #charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer #charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index 3d033958..81f35ecb 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -15,11 +15,10 @@ bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise charm pull cs:trusty/mongodb $distro/mongodb charm pull cs:$distro/haproxy $distro/haproxy charm pull cs:$distro/ntp $distro/ntp +charm pull cs:$distro/aodh $distro/aodh 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-aodh.git $distro/charm-aodh -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 |