openstack/kolla-ansible
Code Issues Proposed changes

so I can rebase

Browse Source
This commit is contained in:
James Labocki 2014-09-18 09:41:44 -04:00
parent decff743aa
commit 4e906316a4
2 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
docker/keystone/keystone.json
View File

@ -1,33 +0,0 @@
{
"id": "keystone",
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "keystone-1",
"containers": [{
"name": "keystone",
"image": "docker.usersys.redhat.com/jlabocki/keystone",
"ports": [{
"containerPort": 80,
"hostPort": 80
}],
"env": [{
'name': 'DB_ROOT_PASSWORD',
'value': 'password'
}]
},
{
"name": "mariadb",
"image": "docker.usersys.redhat.com/lhh1/rhel-osp-mariadb",
"env": [{
'name': 'DB_ROOT_PASSWORD',
'value': 'password'
}]
}]
}
},
"labels": {
"name": "keystone"
}
}

3
docker/keystone/start
View File

@ -2,6 +2,9 @@
env > /root/ENV env > /root/ENV
sleep 1000000
socat UNIX-LISTEN:/var/lib/mysql/mysql.sock,fork,reuseaddr,unlink-early,user=mysql,group=mysql,mode=777 TCP:127.0.0.1:3306 & socat UNIX-LISTEN:/var/lib/mysql/mysql.sock,fork,reuseaddr,unlink-early,user=mysql,group=mysql,mode=777 TCP:127.0.0.1:3306 &
/usr/bin/openstack-db --service keystone --init --yes --rootpw ${DB_ROOT_PASSWORD} --password redhat /usr/bin/openstack-db --service keystone --init --yes --rootpw ${DB_ROOT_PASSWORD} --password redhat