summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh24
-rwxr-xr-xci/opencontrail/fetch-charms.sh42
2 files changed, 31 insertions, 35 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 30eda410..3078ac28 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -320,18 +320,6 @@ python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, i
# Configuring deployment
if ([ $opnfvmodel == "openstack" ]); then
- if ([ $opnfvsdn == "ocl" ]); then
- echo_info "Patching OpenContrail controller container"
- juju run --application contrail-controller sudo docker cp contrail-controller:/etc/contrail/vnc_api_lib.ini /tmp
- juju run --application contrail-controller cp /tmp/vnc_api_lib.ini /tmp/vnc_api_lib.ini2
- juju run --application contrail-controller 'echo "AUTHN_DOMAIN = admin_domain" >> /tmp/vnc_api_lib.ini2'
- juju run --application contrail-controller sudo docker cp /tmp/vnc_api_lib.ini2 contrail-controller:/etc/contrail/vnc_api_lib.ini
- juju run --application contrail-controller sudo docker exec contrail-controller service contrail-api restart
-
- juju run --application contrail-controller sudo docker cp /tmp/vnc_api_lib.ini2 contrail-analytics:/etc/contrail/vnc_api_lib.ini
- echo_info "Wait for OpenContrail components to stabilize"
- sleep 600
- fi
echo_info "Configuring OpenStack deployment"
@@ -340,16 +328,22 @@ if ([ $opnfvmodel == "openstack" ]); then
# creating heat domain after pushing the public API into /etc/hosts
status=`juju run-action heat/0 domain-setup`
echo $status
- status=`juju run-action ceilometer/0 ceilometer-upgrade`
+ if ([ $opnfvsdn != "ocl" ]) then
+ status=`juju run-action ceilometer/0 ceilometer-upgrade`
+ fi
echo $status
if ([ $opnftype == "ha" ]); then
status=`juju run-action heat/1 domain-setup`
echo $status
- status=`juju run-action ceilometer/1 ceilometer-upgrade`
+ if ([ $opnfvsdn != "ocl" ]) then
+ status=`juju run-action ceilometer/1 ceilometer-upgrade`
+ fi
echo $status
status=`juju run-action heat/2 domain-setup`
echo $status
- status=`juju run-action ceilometer/2 ceilometer-upgrade`
+ if ([ $opnfvsdn != "ocl" ]) then
+ status=`juju run-action ceilometer/2 ceilometer-upgrade`
+ fi
echo $status
fi
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 62fbbd6b..03b67eed 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -12,28 +12,30 @@ function build {
# openstack
bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
-git clone -b stable/17.08 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
-git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone -b stable/17.08 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone -b stable/17.08 https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone -b stable/17.08 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone -b stable/17.08 https://github.com/openstack/charm-glance.git $distro/glance
-git clone -b stable/17.08 https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone -b stable/17.08 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone -b stable/17.08 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone -b stable/17.08 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
-git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd
+git clone -b stable/18.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/18.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/18.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/18.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
+git clone -b stable/18.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/18.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/18.02 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/18.02 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/18.02 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/18.02 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/18.02 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/18.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone -b stable/18.02 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone -b stable/18.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/18.02 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/18.02 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/18.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/18.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/18.02 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/18.02 https://github.com/openstack/charm-lxd.git $distro/lxd
git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
+charm pull cs:memcached $distro/memcached
+charm pull cs:gnocchi $distro/gnocchi
charm pull cs:$distro/mongodb $distro/mongodb
charm pull cs:ntp $distro/ntp
charm pull cs:$distro/aodh $distro/aodh
#008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
Device tree binding vendor prefix registry.  Keep list in alphabetical order.

This isn't an exhaustive list, but you should add new prefixes to it before
using them to avoid name-space collisions.

abilis	Abilis Systems
abcn	Abracon Corporation
active-semi	Active-Semi International Inc
ad	Avionic Design GmbH
adapteva	Adapteva, Inc.
adh	AD Holdings Plc.
adi	Analog Devices, Inc.
aeroflexgaisler	Aeroflex Gaisler AB
al	Annapurna Labs
allwinner	Allwinner Technology Co., Ltd.
alphascale	AlphaScale Integrated Circuits Systems, Inc.
altr	Altera Corp.
amcc	Applied Micro Circuits Corporation (APM, formally AMCC)
amd	Advanced Micro Devices (AMD), Inc.
amlogic	Amlogic, Inc.
ampire	Ampire Co., Ltd.
ams	AMS AG
amstaos	AMS-Taos Inc.
apm	Applied Micro Circuits Corporation (APM)
aptina	Aptina Imaging
arasan	Arasan Chip Systems
arm	ARM Ltd.
armadeus	ARMadeus Systems SARL
artesyn	Artesyn Embedded Technologies Inc.
asahi-kasei	Asahi Kasei Corp.
atmel	Atmel Corporation
auo	AU Optronics Corporation
avago	Avago Technologies
avic	Shanghai AVIC Optoelectronics Co., Ltd.
axis	Axis Communications AB
bosch	Bosch Sensortec GmbH
boundary	Boundary Devices Inc.
brcm	Broadcom Corporation
buffalo	Buffalo, Inc.
calxeda	Calxeda
capella	Capella Microsystems, Inc
cavium	Cavium, Inc.
cdns	Cadence Design Systems Inc.
ceva	Ceva, Inc.
chipidea	Chipidea, Inc
chipone		ChipOne
chipspark	ChipSPARK
chrp	Common Hardware Reference Platform
chunghwa	Chunghwa Picture Tubes Ltd.
ciaa	Computadora Industrial Abierta Argentina
cirrus	Cirrus Logic, Inc.
cloudengines	Cloud Engines, Inc.
cnm	Chips&Media, Inc.
cnxt	Conexant Systems, Inc.
compulab	CompuLab Ltd.
cortina	Cortina Systems, Inc.
cosmic	Cosmic Circuits
crystalfontz	Crystalfontz America, Inc.
cubietech	Cubietech, Ltd.
cypress	Cypress Semiconductor Corporation
dallas	Maxim Integrated Products (formerly Dallas Semiconductor)
davicom	DAVICOM Semiconductor, Inc.
delta	Delta Electronics, Inc.
denx	Denx Software Engineering
digi	Digi International Inc.
digilent	Diglent, Inc.
dlg	Dialog Semiconductor
dlink	D-Link Corporation
dmo	Data Modul AG
ea	Embedded Artists AB
ebv	EBV Elektronik
edt	Emerging Display Technologies
elan	Elan Microelectronic Corp.
emmicro	EM Microelectronic
energymicro	Silicon Laboratories (formerly Energy Micro AS)
epcos	EPCOS AG
epfl	Ecole Polytechnique Fédérale de Lausanne
epson	Seiko Epson Corp.
est	ESTeem Wireless Modems
ettus	NI Ettus Research
eukrea  Eukréa Electromatique
everest	Everest Semiconductor Co. Ltd.
everspin	Everspin Technologies, Inc.
excito	Excito
fcs	Fairchild Semiconductor
firefly	Firefly
focaltech	FocalTech Systems Co.,Ltd
fsl	Freescale Semiconductor
GEFanuc	GE Fanuc Intelligent Platforms Embedded Systems, Inc.
gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.
geniatech	Geniatech, Inc.
giantplus	Giantplus Technology Co., Ltd.
globalscale	Globalscale Technologies, Inc.
gmt	Global Mixed-mode Technology, Inc.
goodix	Shenzhen Huiding Technology Co., Ltd.
google	Google, Inc.
grinn	Grinn
gumstix	Gumstix, Inc.
gw	Gateworks Corporation
hannstar	HannStar Display Corporation
haoyu	Haoyu Microelectronic Co. Ltd.
hardkernel	Hardkernel Co., Ltd
himax	Himax Technologies, Inc.
hisilicon	Hisilicon Limited.
hit	Hitachi Ltd.
hitex	Hitex Development Tools
holt	Holt Integrated Circuits, Inc.
honeywell	Honeywell
hp	Hewlett Packard
i2se	I2SE GmbH
ibm	International Business Machines (IBM)
idt	Integrated Device Technologies, Inc.
iom	Iomega Corporation
img	Imagination Technologies Ltd.
ingenic	Ingenic Semiconductor
innolux	Innolux Corporation
intel	Intel Corporation
intercontrol	Inter Control Group
invensense	InvenSense Inc.
isee	ISEE 2007 S.L.
isil	Intersil
jedec	JEDEC Solid State Technology Association
karo	Ka-Ro electronics GmbH
keymile	Keymile GmbH
kinetic Kinetic Technologies
lacie	LaCie
lantiq	Lantiq Semiconductor
lenovo	Lenovo Group Ltd.
lg	LG Corporation
linux	Linux-specific binding
lsi	LSI Corp. (LSI Logic)
lltc	Linear Technology Corporation
marvell	Marvell Technology Group Ltd.
maxim	Maxim Integrated Products
mediatek	MediaTek Inc.
melexis	Melexis N.V.
merrii	Merrii Technology Co., Ltd.
micrel	Micrel Inc.
microchip	Microchip Technology Inc.
micron	Micron Technology Inc.
minix	MINIX Technology Ltd.
mitsubishi	Mitsubishi Electric Corporation
mosaixtech	Mosaix Technologies, Inc.
moxa	Moxa
mpl	MPL AG
msi	Micro-Star International Co. Ltd.
mti	Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
mundoreader	Mundo Reader S.L.
murata	Murata Manufacturing Co., Ltd.
mxicy	Macronix International Co., Ltd.
national	National Semiconductor
nec	NEC LCD Technologies, Ltd.
neonode		Neonode Inc.
netgear	NETGEAR
netlogic	Broadcom Corporation (formerly NetLogic Microsystems)
netxeon		Shenzhen Netxeon Technology CO., LTD
newhaven	Newhaven Display International
nintendo	Nintendo
nokia	Nokia
nuvoton	Nuvoton Technology Corporation
nvidia	NVIDIA
nxp	NXP Semiconductors
okaya	Okaya Electric America, Inc.
onnn	ON Semiconductor Corp.
opencores	OpenCores.org
option	Option NV
ortustech	Ortus Technology Co., Ltd.
ovti	OmniVision Technologies
panasonic	Panasonic Corporation
parade	Parade Technologies Inc.
pericom	Pericom Technology Inc.
phytec	PHYTEC Messtechnik GmbH
picochip	Picochip Ltd
plathome	Plat'Home Co., Ltd.
plda	PLDA
pixcir  PIXCIR MICROELECTRONICS Co., Ltd
pulsedlight	PulsedLight, Inc
powervr	PowerVR (deprecated, use img)
qca	Qualcomm Atheros, Inc.
qcom	Qualcomm Technologies, Inc
qemu	QEMU, a generic and open source machine emulator and virtualizer
qi	Qi Hardware
qnap	QNAP Systems, Inc.
radxa	Radxa
raidsonic	RaidSonic Technology GmbH
ralink	Mediatek/Ralink Technology Corp.
ramtron	Ramtron International
raspberrypi	Raspberry Pi Foundation
realtek Realtek Semiconductor Corp.
renesas	Renesas Electronics Corporation
richtek	Richtek Technology Corporation
ricoh	Ricoh Co. Ltd.
rockchip	Fuzhou Rockchip Electronics Co., Ltd
samsung	Samsung Semiconductor
sandisk	Sandisk Corporation
sbs	Smart Battery System
schindler	Schindler
seagate	Seagate Technology PLC
semtech	Semtech Corporation
sgx	SGX Sensortech
sharp	Sharp Corporation
sigma	Sigma Designs, Inc.
sil	Silicon Image
silabs	Silicon Laboratories
siliconmitus	Silicon Mitus, Inc.
simtek
sii	Seiko Instruments, Inc.
silergy	Silergy Corp.
sirf	SiRF Technology, Inc.
sitronix	Sitronix Technology Corporation
skyworks	Skyworks Solutions, Inc.
smsc	Standard Microsystems Corporation
snps	Synopsys, Inc.
socionext	Socionext Inc.
solidrun	SolidRun
solomon        Solomon Systech Limited
sony	Sony Corporation
spansion	Spansion Inc.
sprd	Spreadtrum Communications Inc.
st	STMicroelectronics
ste	ST-Ericsson
stericsson	ST-Ericsson
synology	Synology, Inc.
tbs	TBS Technologies
tcl	Toby Churchill Ltd.
thine	THine Electronics, Inc.
ti	Texas Instruments
tlm	Trusted Logic Mobility
toradex	Toradex AG
toshiba	Toshiba Corporation
toumaz	Toumaz
tplink	TP-LINK Technologies Co., Ltd.
tronfy	Tronfy
truly	Truly Semiconductors Limited
upisemi	uPI Semiconductor Corp.
usi	Universal Scientific Industrial Co., Ltd.
v3	V3 Semiconductor
variscite	Variscite Ltd.
via	VIA Technologies, Inc.
virtio	Virtual I/O Device Specification, developed by the OASIS consortium
voipac	Voipac Technologies s.r.o.
wexler	Wexler
winbond Winbond Electronics corp.
wlf	Wolfson Microelectronics
wm	Wondermedia Technologies, Inc.
x-powers	X-Powers
xes	Extreme Engineering Solutions (X-ES)
xillybus	Xillybus Ltd.
xlnx	Xilinx
zyxel	ZyXEL Communications Corp.
zarlink	Zarlink Semiconductor
zii	Zodiac Inflight Innovations
zte	ZTE Corp.